From 0dcec9ffb997af01b7a08ae744814b547b2d1f99 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 14 May 2002 14:34:21 +0000 Subject: [PATCH] function_base.hpp: - Fixed strange patch weirdness on Sun WorkShop C++ [SVN r13855] --- include/boost/function/function_base.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp index d827538..991b619 100644 --- a/include/boost/function/function_base.hpp +++ b/include/boost/function/function_base.hpp @@ -307,13 +307,13 @@ namespace boost { public: // should be protected, but GCC 2.95.3 will fail to allow access detail::function::any_pointer (*manager)( detail::function::any_pointer, + detail::function::functor_manager_operation_type); + detail::function::any_pointer functor; + #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG) // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it operator bool () const { return !this->empty(); } #else - detail::function::functor_manager_operation_type); - detail::function::any_pointer functor; - private: struct dummy { void nonnull() {}; @@ -324,10 +324,10 @@ namespace boost { public: operator safe_bool () const { return (this->empty())? 0 : &dummy::nonnull; } -#endif safe_bool operator!() const { return (this->empty())? &dummy::nonnull : 0; } +#endif }; /* Poison comparison between Boost.Function objects (because it is