boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-03 22:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/replace-deprecated' of https://github.com/DanielaE/boost.container into DanielaE-feature/replace-deprecated

Browse Source
This commit is contained in:
Ion Gaztañaga
2017-05-26 22:02:11 +02:00
parent 9c09a0cbc7 36c334f414
commit 424b5e5848
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/container/string.hpp
View File

@@ -542,7 +542,11 @@ class basic_string
bool operator()(const typename Tr::char_type& x) const bool operator()(const typename Tr::char_type& x) const
{ {
return std::find_if(m_first, m_last, return std::find_if(m_first, m_last,
#ifdef BOOST_NO_CXX98_BINDERS
[&](argument_type ch) { return Eq_traits<Tr>()(x, ch); }) == m_last;
#else
std::bind1st(Eq_traits<Tr>(), x)) == m_last; std::bind1st(Eq_traits<Tr>(), x)) == m_last;
#endif
} }
}; };
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
@@ -2300,7 +2304,11 @@ class basic_string
pointer finish = addr + sz; pointer finish = addr + sz;
const const_iterator result = const const_iterator result =
std::find_if(addr + pos, finish, std::find_if(addr + pos, finish,
#ifdef BOOST_NO_CXX98_BINDERS
[&](value_type ch) { return Eq_traits<Traits>()(ch, c); });
#else
std::bind2nd(Eq_traits<Traits>(), c)); std::bind2nd(Eq_traits<Traits>(), c));
#endif
return result != finish ? result - begin() : npos; 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 const_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1;
const_reverse_iterator rresult = const_reverse_iterator rresult =
std::find_if(const_reverse_iterator(last), rend(), std::find_if(const_reverse_iterator(last), rend(),
#ifdef BOOST_NO_CXX98_BINDERS
[&](value_type ch) { return Eq_traits<Traits>()(ch, c); });
#else
std::bind2nd(Eq_traits<Traits>(), c)); std::bind2nd(Eq_traits<Traits>(), c));
#endif
return rresult != rend() ? (rresult.base() - 1) - begin() : npos; return rresult != rend() ? (rresult.base() - 1) - begin() : npos;
} }
} }
@@ -2550,7 +2562,11 @@ class basic_string
const pointer finish = addr + this->priv_size(); const pointer finish = addr + this->priv_size();
const const_iterator result const const_iterator result
= std::find_if(addr + pos, finish, = std::find_if(addr + pos, finish,
#ifdef BOOST_NO_CXX98_BINDERS
[&](value_type ch) { return !Eq_traits<Traits>()(ch, c); });
#else
std::not1(std::bind2nd(Eq_traits<Traits>(), c))); std::not1(std::bind2nd(Eq_traits<Traits>(), c)));
#endif
return result != finish ? result - begin() : npos; 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_iterator last = begin() + container_detail::min_value(len - 1, pos) + 1;
const const_reverse_iterator rresult = const const_reverse_iterator rresult =
std::find_if(const_reverse_iterator(last), rend(), std::find_if(const_reverse_iterator(last), rend(),
#ifdef BOOST_NO_CXX98_BINDERS
[&](value_type ch) { return !Eq_traits<Traits>()(ch, c); });
#else
std::not1(std::bind2nd(Eq_traits<Traits>(), c))); std::not1(std::bind2nd(Eq_traits<Traits>(), c)));
#endif
return rresult != rend() ? (rresult.base() - 1) - begin() : npos; return rresult != rend() ? (rresult.base() - 1) - begin() : npos;
} }
} }