From f3b61bd6816546a39a072a5b8be56d78cf775683 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 19 Jul 2018 16:01:30 +0200 Subject: [PATCH] restore join_string() symbols in library To keep the library it backward compatible, instantiate versions of join_string() for STL containers. Old symbols (x86): 0003a040 g DF .text 00000083 Base _ZN3I2n11join_stringERKSt4listISsSaISsEERKSs 00039fb0 g DF .text 00000084 Base _ZN3I2n11join_stringERKSt6vectorISsSaISsEERKSs New symbols: 000aa0fd g DF .text 00000041 Base _ZN3I2n11join_stringERKSt4listISsSaISsEERKSs 000b084d w DF .text 0000017d Base _ZN3I2n11join_stringISt20_List_const_iteratorISsEEESsT_S3_RKSs 000b09ca w DF .text 0000017d Base _ZN3I2n11join_stringIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEEESsT_S9_RS3_ 000aa13e g DF .text 00000041 Base _ZN3I2n11join_stringERKSt6vectorISsSaISsEERKSs 000afbce w DF .text 00000074 Base _ZN3I2n11join_stringISt6vectorISsSaISsEEEESsRKT_RKSs 000a9f62 g DF .text 0000019b Base _ZN3I2n11join_stringEPKPKcRKSs 000afb5a w DF .text 00000074 Base _ZN3I2n11join_stringISt4listISsSaISsEEEESsRKT_RKSs --- src/stringfunc.cpp | 6 ++++++ src/stringfunc.hxx | 9 +++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/stringfunc.cpp b/src/stringfunc.cpp index d611abf..bacccb0 100644 --- a/src/stringfunc.cpp +++ b/src/stringfunc.cpp @@ -454,7 +454,13 @@ std::string join_string ( return result; } +std::string +join_string (const std::list &l, const std::string &d) +{ return join_string >(l, d); } +std::string +join_string (const std::vector &l, const std::string &d) +{ return join_string >(l, d); } /* ** conversions diff --git a/src/stringfunc.hxx b/src/stringfunc.hxx index d945526..be1c4a8 100644 --- a/src/stringfunc.hxx +++ b/src/stringfunc.hxx @@ -179,6 +179,15 @@ std::string join_string( ); /* + * provide instantiation wrappers for ABI compatibility + */ +std::string join_string (const std::list &l, + const std::string &d = "\n"); + +std::string join_string (const std::vector &l, + const std::string &d = "\n"); + +/* ** conversions: */ -- 1.7.1