From 5b24f31486a64aab50771bedf5d77e7e825e9bdf Mon Sep 17 00:00:00 2001 From: Pavol Droba Date: Fri, 2 Nov 2007 21:00:08 +0000 Subject: [PATCH] merging changes from 1.34 [SVN r40698] --- include/boost/algorithm/string/regex.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/boost/algorithm/string/regex.hpp b/include/boost/algorithm/string/regex.hpp index c3b2600..98a0dfc 100644 --- a/include/boost/algorithm/string/regex.hpp +++ b/include/boost/algorithm/string/regex.hpp @@ -634,6 +634,12 @@ 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