From eaf4f0474860c879a2b2cc7f366850fe6d77f061 Mon Sep 17 00:00:00 2001 From: jerryjacobs Date: Tue, 20 Oct 2009 18:26:08 +0000 Subject: [PATCH] Hacked boost check macro to compile correct on Mac OSX Leopard --- include/boost/detail/is_incrementable.hpp | 10 +++++----- include/boost/ptr_container/detail/static_move_ptr.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/detail/is_incrementable.hpp b/include/boost/detail/is_incrementable.hpp index 1c8fd5785b..ee5c8f30b3 100644 --- a/include/boost/detail/is_incrementable.hpp +++ b/include/boost/detail/is_incrementable.hpp @@ -69,11 +69,11 @@ namespace is_incrementable_ # pragma warning(disable:4913) // Warning about operator, # endif - // two check overloads help us identify which operator++ was picked - char (& check(tag) )[2]; + // two check_ overloads help us identify which operator++ was picked + char (& check_(tag) )[2]; template - char check(T const&); + char check_(T const&); template @@ -83,7 +83,7 @@ namespace is_incrementable_ BOOST_STATIC_CONSTANT( bool - , value = sizeof(is_incrementable_::check(BOOST_comma(++x,0))) == 1 + , value = sizeof(is_incrementable_::check_(BOOST_comma(++x,0))) == 1 ); }; @@ -94,7 +94,7 @@ namespace is_incrementable_ BOOST_STATIC_CONSTANT( bool - , value = sizeof(is_incrementable_::check(BOOST_comma(x++,0))) == 1 + , value = sizeof(is_incrementable_::check_(BOOST_comma(x++,0))) == 1 ); }; diff --git a/include/boost/ptr_container/detail/static_move_ptr.hpp b/include/boost/ptr_container/detail/static_move_ptr.hpp index ba2b9af746..493d717a79 100644 --- a/include/boost/ptr_container/detail/static_move_ptr.hpp +++ b/include/boost/ptr_container/detail/static_move_ptr.hpp @@ -151,7 +151,7 @@ public: deleter_const_reference get_deleter() const { return impl_.second(); } private: template - void check(const static_move_ptr& ptr) + void check_(const static_move_ptr& ptr) { typedef move_ptrs::is_smart_ptr_convertible convertible; BOOST_STATIC_ASSERT(convertible::value);