From baa020be4a0fac65bec1960ad8e3a21c89bbe331 Mon Sep 17 00:00:00 2001 From: Mark Rodgers Date: Tue, 1 Aug 2000 07:53:58 +0000 Subject: [PATCH] Workarounds for Metrowerks as suggested by Fabrice Truillot. [SVN r7672] --- include/boost/functional.hpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/boost/functional.hpp b/include/boost/functional.hpp index 7947c26..501e97a 100644 --- a/include/boost/functional.hpp +++ b/include/boost/functional.hpp @@ -16,6 +16,9 @@ // $Id$ // ------------------------------------------------------------------------------ // $Log$ +// Revision 1.2 2000/08/01 07:53:58 mark_rodgers +// Workarounds for Metrowerks as suggested by Fabrice Truillot. +// // Revision 1.1.1.1 2000/07/07 16:03:47 beman // 1.16.1 initial CVS checkin // @@ -137,7 +140,7 @@ namespace boost typedef A1 first_argument_type; typedef A2 second_argument_type; }; -#else +#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION // -------------------------------------------------------------------------- // If we have no partial specialisation available, decay to a situation // that is no worse than in the Standard, i.e., ptr_fun will be required. @@ -161,7 +164,7 @@ namespace boost typedef typename Operation::first_argument_type first_argument_type; typedef typename Operation::second_argument_type second_argument_type; }; -#endif +#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION // -------------------------------------------------------------------------- // unary_negate, not1 @@ -375,6 +378,7 @@ namespace boost return mem_fun1_t(f); } +#ifndef BOOST_NO_POINTER_TO_MEMBER_CONST template inline const_mem_fun_t mem_fun(S (T::*f)() const) { @@ -386,6 +390,7 @@ namespace boost { return const_mem_fun1_t(f); } +#endif // BOOST_NO_POINTER_TO_MEMBER_CONST // -------------------------------------------------------------------------- // mem_fun_ref, etc @@ -468,6 +473,7 @@ namespace boost return mem_fun1_ref_t(f); } +#ifndef BOOST_NO_POINTER_TO_MEMBER_CONST template inline const_mem_fun_ref_t mem_fun_ref(S (T::*f)() const) { @@ -479,6 +485,7 @@ namespace boost { return const_mem_fun1_ref_t(f); } +#endif // BOOST_NO_POINTER_TO_MEMBER_CONST // -------------------------------------------------------------------------- // ptr_fun