diff --git a/include/boost/algorithm/cxx14/equal.hpp b/include/boost/algorithm/cxx14/equal.hpp index f1539f885..0cf3e46f6 100644 --- a/include/boost/algorithm/cxx14/equal.hpp +++ b/include/boost/algorithm/cxx14/equal.hpp @@ -13,7 +13,6 @@ #define BOOST_ALGORITHM_EQUAL_HPP #include // for std::equal -#include // for std::binary_function #include namespace boost { namespace algorithm { @@ -21,9 +20,10 @@ namespace boost { namespace algorithm { namespace detail { template - struct eq : public std::binary_function { + struct eq { + typedef bool result_type; bool operator () ( const T1& v1, const T2& v2 ) const { return v1 == v2 ;} - }; + }; template bool equal ( RandomAccessIterator1 first1, RandomAccessIterator1 last1, diff --git a/include/boost/algorithm/string/detail/case_conv.hpp b/include/boost/algorithm/string/detail/case_conv.hpp index 42621c74f..db91ba08d 100644 --- a/include/boost/algorithm/string/detail/case_conv.hpp +++ b/include/boost/algorithm/string/detail/case_conv.hpp @@ -13,7 +13,6 @@ #include #include -#include #include @@ -30,7 +29,7 @@ namespace boost { // a tolower functor template - struct to_lowerF : public std::unary_function + struct to_lowerF { // Constructor to_lowerF( const std::locale& Loc ) : m_Loc( &Loc ) {} @@ -50,7 +49,7 @@ namespace boost { // a toupper functor template - struct to_upperF : public std::unary_function + struct to_upperF { // Constructor to_upperF( const std::locale& Loc ) : m_Loc( &Loc ) {} diff --git a/include/boost/algorithm/string/detail/util.hpp b/include/boost/algorithm/string/detail/util.hpp index cf4a8b1c8..8e7bf716d 100644 --- a/include/boost/algorithm/string/detail/util.hpp +++ b/include/boost/algorithm/string/detail/util.hpp @@ -12,7 +12,6 @@ #define BOOST_STRING_UTIL_DETAIL_HPP #include -#include #include namespace boost { @@ -89,8 +88,7 @@ namespace boost { template< typename SeqT, typename IteratorT=BOOST_STRING_TYPENAME SeqT::const_iterator > - struct copy_iterator_rangeF : - public std::unary_function< iterator_range, SeqT > + struct copy_iterator_rangeF { SeqT operator()( const iterator_range& Range ) const { diff --git a/test/all_of_test.cpp b/test/all_of_test.cpp index 36918d5e8..379350e3a 100644 --- a/test/all_of_test.cpp +++ b/test/all_of_test.cpp @@ -13,12 +13,11 @@ #define BOOST_TEST_MAIN #include -#include #include #include template -struct is_ : public std::unary_function { +struct is_ { is_ ( T v ) : val_ ( v ) {} ~is_ () {} bool operator () ( T comp ) const { return val_ == comp; } diff --git a/test/any_of_test.cpp b/test/any_of_test.cpp index a3267c59f..6c0bc5ecf 100644 --- a/test/any_of_test.cpp +++ b/test/any_of_test.cpp @@ -13,12 +13,11 @@ #define BOOST_TEST_MAIN #include -#include #include #include template -struct is_ : public std::unary_function { +struct is_ { is_ ( T v ) : val_ ( v ) {} ~is_ () {} bool operator () ( T comp ) const { return val_ == comp; } diff --git a/test/none_of_test.cpp b/test/none_of_test.cpp index fc74945e9..59350bab6 100644 --- a/test/none_of_test.cpp +++ b/test/none_of_test.cpp @@ -13,12 +13,11 @@ #define BOOST_TEST_MAIN #include -#include #include #include template -struct is_ : public std::unary_function { +struct is_ { is_ ( T v ) : val_ ( v ) {} ~is_ () {} bool operator () ( T comp ) const { return val_ == comp; } diff --git a/test/one_of_test.cpp b/test/one_of_test.cpp index 942288189..db22162bc 100644 --- a/test/one_of_test.cpp +++ b/test/one_of_test.cpp @@ -13,12 +13,11 @@ #define BOOST_TEST_MAIN #include -#include #include #include template -struct is_ : public std::unary_function { +struct is_ { is_ ( T v ) : val_ ( v ) {} ~is_ () {} bool operator () ( T comp ) const { return val_ == comp; }