diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp index 915fb58..da4136d 100644 --- a/include/boost/container/string.hpp +++ b/include/boost/container/string.hpp @@ -542,7 +542,11 @@ class basic_string bool operator()(const typename Tr::char_type& x) const { return std::find_if(m_first, m_last, +#ifdef BOOST_NO_CXX98_BINDERS + [&](argument_type ch) { return Eq_traits()(x, ch); }) == m_last; +#else std::bind1st(Eq_traits(), x)) == m_last; +#endif } }; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -2300,7 +2304,11 @@ class basic_string pointer finish = addr + sz; const const_iterator result = std::find_if(addr + pos, finish, +#ifdef BOOST_NO_CXX98_BINDERS + [&](value_type ch) { return Eq_traits()(ch, c); }); +#else std::bind2nd(Eq_traits(), c)); +#endif return result != finish ? result - begin() : npos; } } @@ -2372,7 +2380,11 @@ class basic_string const const_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1; const_reverse_iterator rresult = std::find_if(const_reverse_iterator(last), rend(), +#ifdef BOOST_NO_CXX98_BINDERS + [&](value_type ch) { return Eq_traits()(ch, c); }); +#else std::bind2nd(Eq_traits(), c)); +#endif return rresult != rend() ? (rresult.base() - 1) - begin() : npos; } } @@ -2550,7 +2562,11 @@ class basic_string const pointer finish = addr + this->priv_size(); const const_iterator result = std::find_if(addr + pos, finish, +#ifdef BOOST_NO_CXX98_BINDERS + [&](value_type ch) { return !Eq_traits()(ch, c); }); +#else std::not1(std::bind2nd(Eq_traits(), c))); +#endif return result != finish ? result - begin() : npos; } } @@ -2617,7 +2633,11 @@ class basic_string const const_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1; const const_reverse_iterator rresult = std::find_if(const_reverse_iterator(last), rend(), +#ifdef BOOST_NO_CXX98_BINDERS + [&](value_type ch) { return !Eq_traits()(ch, c); }); +#else std::not1(std::bind2nd(Eq_traits(), c))); +#endif return rresult != rend() ? (rresult.base() - 1) - begin() : npos; } }