From 9a34538af05109d5979d0cba88e1c24e54f71a2c Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Wed, 15 Aug 2018 17:14:58 +0200 Subject: [PATCH] Revert "restore join_string() symbols in library" We bump the SOVERSION of the library, so no compat functions needed anymore. This reverts commit f3b61bd6816546a39a072a5b8be56d78cf775683. --- src/stringfunc.cpp | 6 ------ src/stringfunc.hxx | 9 --------- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/src/stringfunc.cpp b/src/stringfunc.cpp index bacccb0..d611abf 100644 --- a/src/stringfunc.cpp +++ b/src/stringfunc.cpp @@ -454,13 +454,7 @@ 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 be1c4a8..d945526 100644 --- a/src/stringfunc.hxx +++ b/src/stringfunc.hxx @@ -179,15 +179,6 @@ 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