From 136960eaf6db118dbafc417eb46fd3642fe6a8e5 Mon Sep 17 00:00:00 2001 From: Arkadiy Vertleyb Date: Fri, 16 Dec 2005 11:44:47 +0000 Subject: [PATCH] w/a cw externel binders [SVN r32069] --- include/boost/typeof/std/functional.hpp | 22 ++++++++++++++-------- test/std.cpp | 10 ---------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/include/boost/typeof/std/functional.hpp b/include/boost/typeof/std/functional.hpp index 3e540f6..f1b1577 100755 --- a/include/boost/typeof/std/functional.hpp +++ b/include/boost/typeof/std/functional.hpp @@ -2,8 +2,6 @@ // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt) -// This is a generated file -- please do not modify by hand. - #ifndef BOOST_TYPEOF_STD_functional_hpp_INCLUDED #define BOOST_TYPEOF_STD_functional_hpp_INCLUDED @@ -31,19 +29,27 @@ BOOST_TYPEOF_REGISTER_TEMPLATE(std::logical_or, 1) BOOST_TYPEOF_REGISTER_TEMPLATE(std::logical_not, 1) BOOST_TYPEOF_REGISTER_TEMPLATE(std::unary_negate, 1) BOOST_TYPEOF_REGISTER_TEMPLATE(std::binary_negate, 1) -BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder1st, 1) -BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder2nd, 1) + +#if defined(__MWERKS__) && defined(_MSL_EXTENDED_BINDERS) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder1st, 2) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder2nd, 2) +#else + BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder1st, 1) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder2nd, 1) +#endif + BOOST_TYPEOF_REGISTER_TEMPLATE(std::pointer_to_unary_function, 2) BOOST_TYPEOF_REGISTER_TEMPLATE(std::pointer_to_binary_function, 3) BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun_t, 2) BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun1_t, 3) BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun_ref_t, 2) BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun1_ref_t, 3) + #if !BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) -BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun_t, 2) -BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_t, 3) -BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun_ref_t, 2) -BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_ref_t, 3) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun_t, 2) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_t, 3) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun_ref_t, 2) + BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_ref_t, 3) #endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) #endif//BOOST_TYPEOF_STD_functional_hpp_INCLUDED diff --git a/test/std.cpp b/test/std.cpp index 96267c1..1cce1d2 100755 --- a/test/std.cpp +++ b/test/std.cpp @@ -22,16 +22,6 @@ using namespace std; -// This is temporary -- to check cw (remove later) - -#if defined(_MSL_EXTENDED_BINDERS) - typedef std::binder1st< int, int > type1; - typedef std::binder2nd< int, int > type2; -#else - typedef std::binder1st< int > type1; - typedef std::binder2nd< int > type2; -#endif - // STL containers BOOST_STATIC_ASSERT(boost::type_of::test::value);