boost/algorithm/string/regex.hpp unmerged change?

Does the 2nd change here need to be applied? --- boost/algorithm/string/regex.hpp (revision 33417) +++ boost/algorithm/string/regex.hpp (revision 40687) @@ -584,8 +584,8 @@ // Construct container to hold the result ResultT Result; + - // Roll to the first element that will be added while( itBegin!=itEnd && @@ -630,6 +630,14 @@ 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 -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
participants (1)
-
David Abrahams