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