From 96f572b19ba3de7004b4cbf2af9c5a9414d97bcb Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 1 Oct 2003 11:12:15 +0000 Subject: [PATCH] Switched unspecified_bool_type to data member pointer. [SVN r20238] --- include/boost/intrusive_ptr.hpp | 4 ++-- include/boost/scoped_array.hpp | 4 ++-- include/boost/scoped_ptr.hpp | 4 ++-- include/boost/shared_array.hpp | 4 ++-- include/boost/shared_ptr.hpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/boost/intrusive_ptr.hpp b/include/boost/intrusive_ptr.hpp index 06e43fb..b612864 100644 --- a/include/boost/intrusive_ptr.hpp +++ b/include/boost/intrusive_ptr.hpp @@ -130,11 +130,11 @@ public: #else - typedef T * (intrusive_ptr::*unspecified_bool_type) () const; + typedef T * this_type::*unspecified_bool_type; operator unspecified_bool_type () const { - return p_ == 0? 0: &intrusive_ptr::get; + return p_ == 0? 0: &this_type::p_; } #endif diff --git a/include/boost/scoped_array.hpp b/include/boost/scoped_array.hpp index 1930f20..08155e9 100644 --- a/include/boost/scoped_array.hpp +++ b/include/boost/scoped_array.hpp @@ -95,11 +95,11 @@ public: #else - typedef T * (this_type::*unspecified_bool_type)() const; + typedef T * this_type::*unspecified_bool_type; operator unspecified_bool_type() const // never throws { - return ptr == 0? 0: &this_type::get; + return ptr == 0? 0: &this_type::ptr; } #endif diff --git a/include/boost/scoped_ptr.hpp b/include/boost/scoped_ptr.hpp index 429d295..da4aeef 100644 --- a/include/boost/scoped_ptr.hpp +++ b/include/boost/scoped_ptr.hpp @@ -112,11 +112,11 @@ public: #else - typedef T * (this_type::*unspecified_bool_type)() const; + typedef T * this_type::*unspecified_bool_type; operator unspecified_bool_type() const // never throws { - return ptr == 0? 0: &this_type::get; + return ptr == 0? 0: &this_type::ptr; } #endif diff --git a/include/boost/shared_array.hpp b/include/boost/shared_array.hpp index 2009efd..b380879 100644 --- a/include/boost/shared_array.hpp +++ b/include/boost/shared_array.hpp @@ -104,11 +104,11 @@ public: #else - typedef T * (this_type::*unspecified_bool_type)() const; + typedef T * this_type::*unspecified_bool_type; operator unspecified_bool_type() const // never throws { - return px == 0? 0: &this_type::get; + return px == 0? 0: &this_type::px; } #endif diff --git a/include/boost/shared_ptr.hpp b/include/boost/shared_ptr.hpp index 8720a2c..f7d80ae 100644 --- a/include/boost/shared_ptr.hpp +++ b/include/boost/shared_ptr.hpp @@ -271,11 +271,11 @@ public: #else - typedef T * (this_type::*unspecified_bool_type)() const; + typedef T * this_type::*unspecified_bool_type; operator unspecified_bool_type() const // never throws { - return px == 0? 0: &this_type::get; + return px == 0? 0: &this_type::px; } #endif