Commit eaf4f047 authored by jerryjacobs's avatar jerryjacobs

Hacked boost check macro to compile correct on Mac OSX Leopard

parent 9880975e
...@@ -69,11 +69,11 @@ namespace is_incrementable_ ...@@ -69,11 +69,11 @@ namespace is_incrementable_
# pragma warning(disable:4913) // Warning about operator, # pragma warning(disable:4913) // Warning about operator,
# endif # endif
// two check overloads help us identify which operator++ was picked // two check_ overloads help us identify which operator++ was picked
char (& check(tag) )[2]; char (& check_(tag) )[2];
template <class T> template <class T>
char check(T const&); char check_(T const&);
template <class T> template <class T>
...@@ -83,7 +83,7 @@ namespace is_incrementable_ ...@@ -83,7 +83,7 @@ namespace is_incrementable_
BOOST_STATIC_CONSTANT( BOOST_STATIC_CONSTANT(
bool 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_ ...@@ -94,7 +94,7 @@ namespace is_incrementable_
BOOST_STATIC_CONSTANT( BOOST_STATIC_CONSTANT(
bool bool
, value = sizeof(is_incrementable_::check(BOOST_comma(x++,0))) == 1 , value = sizeof(is_incrementable_::check_(BOOST_comma(x++,0))) == 1
); );
}; };
......
...@@ -151,7 +151,7 @@ public: ...@@ -151,7 +151,7 @@ public:
deleter_const_reference get_deleter() const { return impl_.second(); } deleter_const_reference get_deleter() const { return impl_.second(); }
private: private:
template<typename TT, typename DD> template<typename TT, typename DD>
void check(const static_move_ptr<TT, DD>& ptr) void check_(const static_move_ptr<TT, DD>& ptr)
{ {
typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible; typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible;
BOOST_STATIC_ASSERT(convertible::value); BOOST_STATIC_ASSERT(convertible::value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment