From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 15 Aug 2018 15:14:58 +0000 (+0200)
Subject: Revert "restore join_string() symbols in library"
X-Git-Tag: v2.11~7
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=9a34538af05109d5979d0cba88e1c24e54f71a2c;hp=78cd0cd139d7ff54d449918871aab2abb92aca28;p=libi2ncommon

Revert "restore join_string() symbols in library"

We bump the SOVERSION of the library, so no compat functions needed anymore.

This reverts commit f3b61bd6816546a39a072a5b8be56d78cf775683.
---

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<std::string> &l, const std::string &d)
-{ return join_string<std::list<std::string> >(l, d); }
 
-std::string
-join_string (const std::vector<std::string> &l, const std::string &d)
-{ return join_string<std::vector<std::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<std::string> &l,
-                         const std::string &d = "\n");
-
-std::string join_string (const std::vector<std::string> &l,
-                         const std::string &d = "\n");
-
-/*
 ** conversions:
 */