From 8af639b7cfa9caba8d9e0cfc553ac220911bb756 Mon Sep 17 00:00:00 2001 From: Pavol Droba Date: Tue, 30 May 2006 19:13:08 +0000 Subject: [PATCH] missing 'using' directives for join_if and join_if_regex added missing #include added to string_algo.hpp [SVN r34122] --- include/boost/algorithm/string.hpp | 1 + include/boost/algorithm/string/regex.hpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/boost/algorithm/string.hpp b/include/boost/algorithm/string.hpp index 9a5f624..1a664f1 100644 --- a/include/boost/algorithm/string.hpp +++ b/include/boost/algorithm/string.hpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/include/boost/algorithm/string/regex.hpp b/include/boost/algorithm/string/regex.hpp index d882843..630d117 100644 --- a/include/boost/algorithm/string/regex.hpp +++ b/include/boost/algorithm/string/regex.hpp @@ -584,7 +584,7 @@ namespace boost { // Construct container to hold the result ResultT Result; - + // Roll to the first element that will be added while( @@ -630,6 +630,14 @@ namespace boost { using algorithm::find_all_regex; using algorithm::split_regex; +#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING + using algorithm::join_if; +#else // BOOST_NO_FUNCTION_TEMPLATE_ORDERING + using algorithm::join_if_regex; +#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING + + + } // namespace boost