mirror of
https://github.com/boostorg/algorithm.git
synced 2025-07-03 15:56:38 +02:00
merging changes from 1.34
[SVN r40698]
This commit is contained in:
@ -634,6 +634,12 @@ namespace boost {
|
|||||||
using algorithm::find_all_regex;
|
using algorithm::find_all_regex;
|
||||||
using algorithm::split_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
|
} // namespace boost
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user