From: droba_at_[hidden]
Date: 2007-11-02 17:00:08
Author: pavol_droba
Date: 2007-11-02 17:00:08 EDT (Fri, 02 Nov 2007)
New Revision: 40698
URL: http://svn.boost.org/trac/boost/changeset/40698
Log:
merging changes from 1.34
Text files modified:
trunk/boost/algorithm/string/regex.hpp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
Modified: trunk/boost/algorithm/string/regex.hpp
==============================================================================
--- trunk/boost/algorithm/string/regex.hpp (original)
+++ trunk/boost/algorithm/string/regex.hpp 2007-11-02 17:00:08 EDT (Fri, 02 Nov 2007)
@@ -634,6 +634,12 @@
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