From a1e75120124ad29407af92e367509ab63353125b Mon Sep 17 00:00:00 2001 From: Steven Watanabe Date: Wed, 9 Jun 2010 20:16:21 +0000 Subject: [PATCH] Use result_type instead of sig for predicates. Fixes #2868 [SVN r62688] --- .../string/detail/classification.hpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/boost/algorithm/string/detail/classification.hpp b/include/boost/algorithm/string/detail/classification.hpp index 9a34bf0..fb43955 100644 --- a/include/boost/algorithm/string/detail/classification.hpp +++ b/include/boost/algorithm/string/detail/classification.hpp @@ -32,8 +32,8 @@ namespace boost { struct is_classifiedF : public predicate_facade { - // Boost.Lambda support - template struct sig { typedef bool type; }; + // Boost.ResultOf support + typedef bool result_type; // Constructor from a locale is_classifiedF(std::ctype_base::mask Type, std::locale const & Loc = std::locale()) : @@ -72,8 +72,8 @@ namespace boost { typedef typename ::boost::remove_const::type set_value_type; public: - // Boost.Lambda support - template struct sig { typedef bool type; }; + // Boost.ResultOf support + typedef bool result_type; // Constructor template @@ -253,8 +253,8 @@ namespace boost { struct is_from_rangeF : public predicate_facade< is_from_rangeF > { - // Boost.Lambda support - template struct sig { typedef bool type; }; + // Boost.ResultOf support + typedef bool result_type; // Constructor is_from_rangeF( CharT From, CharT To ) : m_From(From), m_To(To) {} @@ -278,8 +278,8 @@ namespace boost { { public: - // Boost.Lambda support - template struct sig { typedef bool type; }; + // Boost.ResultOf support + typedef bool result_type; // Constructor pred_andF( Pred1T Pred1, Pred2T Pred2 ) : @@ -303,8 +303,8 @@ namespace boost { public predicate_facade< pred_orF > { public: - // Boost.Lambda support - template struct sig { typedef bool type; }; + // Boost.ResultOf support + typedef bool result_type; // Constructor pred_orF( Pred1T Pred1, Pred2T Pred2 ) : @@ -328,8 +328,8 @@ namespace boost { public predicate_facade< pred_notF > { public: - // Boost.Lambda support - template struct sig { typedef bool type; }; + // Boost.ResultOf support + typedef bool result_type; // Constructor pred_notF( PredT Pred ) : m_Pred(Pred) {}