diff --git a/src/common/str_list.cc b/src/common/str_list.cc index 33a1157d134..016155e98b7 100644 --- a/src/common/str_list.cc +++ b/src/common/str_list.cc @@ -61,24 +61,3 @@ vector get_str_vec(const string& str, const char *delims) get_str_vec(str, delims, result); return result; } - -void get_str_set(const string& str, const char *delims, set& str_set) -{ - str_set.clear(); - for_each_substr(str, delims, [&str_set] (auto token) { - str_set.emplace(token.begin(), token.end()); - }); -} - -void get_str_set(const string& str, set& str_set) -{ - const char *delims = ";,= \t"; - get_str_set(str, delims, str_set); -} - -set get_str_set(const string& str, const char *delims) -{ - set result; - get_str_set(str, delims, result); - return result; -} diff --git a/src/include/str_list.h b/src/include/str_list.h index 68822c65a2e..1ca61099a24 100644 --- a/src/include/str_list.h +++ b/src/include/str_list.h @@ -70,37 +70,6 @@ extern void get_str_vec(const std::string& str, std::vector get_str_vec(const std::string& str, const char *delims = ";,= \t"); -/** - * Split **str** into a set of strings, using the ";,= \t" delimiters and output the result in **str_set**. - * - * @param [in] str String to split and save as Set - * @param [out] str_set Set modified containing str after it has been split -**/ -extern void get_str_set(const std::string& str, - std::set& str_set); - -/** - * Split **str** into a set of strings, using the **delims** delimiters and output the result in **str_set**. - * - * @param [in] str String to split and save as Set - * @param [in] delims characters used to split **str** - * @param [out] str_set Set modified containing str after it has been split -**/ -template > -void get_str_set(const std::string& str, - const char *delims, - std::set& str_set) -{ - str_set.clear(); - for_each_substr(str, delims, [&str_set] (auto token) { - str_set.emplace(token.begin(), token.end()); - }); -} - -std::set get_str_set(const std::string& str, - const char *delims = ";,= \t"); - - /** * Return a String containing the vector **v** joined with **sep** diff --git a/src/test/test_str_list.cc b/src/test/test_str_list.cc index cb2536dd737..363395011e9 100644 --- a/src/test/test_str_list.cc +++ b/src/test/test_str_list.cc @@ -7,8 +7,7 @@ // SplitTest is parameterized for list/vector/set using Types = ::testing::Types, - std::vector, - std::set>; + std::vector>; template struct SplitTest : ::testing::Test { @@ -20,10 +19,6 @@ struct SplitTest : ::testing::Test { const std::vector& expected) { EXPECT_EQ(expected, get_str_vec(input, delim)); } - void test(const char* input, const char *delim, - const std::set& expected) { - EXPECT_EQ(expected, get_str_set(input, delim)); - } }; TYPED_TEST_SUITE(SplitTest, Types);