|
From: Daniel J. <dan...@us...> - 2007-05-01 21:22:02
|
Update of /cvsroot/boost-sandbox/boost-sandbox/libs/unordered/test/objects In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6048/test/objects Modified Files: minimal.hpp Log Message: Rename some pointer classes to avoid shadowing them in the test allocator. Index: minimal.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/unordered/test/objects/minimal.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- minimal.hpp 18 Mar 2007 20:00:59 -0000 1.6 +++ minimal.hpp 1 May 2007 21:22:01 -0000 1.7 @@ -16,8 +16,8 @@ class assignable; template <class T> class hash; template <class T> class equal_to; - template <class T> class pointer; - template <class T> class const_pointer; + template <class T> class ptr; + template <class T> class const_ptr; template <class T> class allocator; class copy_constructible @@ -68,95 +68,95 @@ bool operator()(T const&, T const&) const { return true; } }; - template <class T> class pointer; - template <class T> class const_pointer; + template <class T> class ptr; + template <class T> class const_ptr; template <class T> - class pointer + class ptr { friend class allocator<T>; - friend class const_pointer<T>; + friend class const_ptr<T>; T* ptr_; - pointer(T* ptr) : ptr_(ptr) {} + ptr(T* ptr) : ptr_(ptr) {} public: - pointer() : ptr_(0) {} + ptr() : ptr_(0) {} - typedef void (pointer::*bool_type)() const; + typedef void (ptr::*bool_type)() const; void this_type_does_not_support_comparisons() const {} T& operator*() const { return *ptr_; } T* operator->() const { return ptr_; } - pointer& operator++() { ++ptr_; return *this; } - pointer operator++(int) { pointer tmp(*this); ++ptr_; return tmp; } - pointer operator+(int s) const { return pointer<T>(ptr_ + s); } + ptr& operator++() { ++ptr_; return *this; } + ptr operator++(int) { ptr tmp(*this); ++ptr_; return tmp; } + ptr operator+(int s) const { return ptr<T>(ptr_ + s); } T& operator[](int s) const { return ptr_[s]; } bool operator!() const { return !ptr_; } operator bool_type() const { return ptr_ ? - &pointer::this_type_does_not_support_comparisons + &ptr::this_type_does_not_support_comparisons : 0; } - bool operator==(pointer const& x) const { return ptr_ == x.ptr_; } - bool operator!=(pointer const& x) const { return ptr_ != x.ptr_; } - bool operator<(pointer const& x) const { return ptr_ < x.ptr_; } - bool operator>(pointer const& x) const { return ptr_ > x.ptr_; } - bool operator<=(pointer const& x) const { return ptr_ <= x.ptr_; } - bool operator>=(pointer const& x) const { return ptr_ >= x.ptr_; } + bool operator==(ptr const& x) const { return ptr_ == x.ptr_; } + bool operator!=(ptr const& x) const { return ptr_ != x.ptr_; } + bool operator<(ptr const& x) const { return ptr_ < x.ptr_; } + bool operator>(ptr const& x) const { return ptr_ > x.ptr_; } + bool operator<=(ptr const& x) const { return ptr_ <= x.ptr_; } + bool operator>=(ptr const& x) const { return ptr_ >= x.ptr_; } - bool operator==(const_pointer<T> const& x) const { return ptr_ == x.ptr_; } - bool operator!=(const_pointer<T> const& x) const { return ptr_ != x.ptr_; } - bool operator<(const_pointer<T> const& x) const { return ptr_ < x.ptr_; } - bool operator>(const_pointer<T> const& x) const { return ptr_ > x.ptr_; } - bool operator<=(const_pointer<T> const& x) const { return ptr_ <= x.ptr_; } - bool operator>=(const_pointer<T> const& x) const { return ptr_ >= x.ptr_; } + bool operator==(const_ptr<T> const& x) const { return ptr_ == x.ptr_; } + bool operator!=(const_ptr<T> const& x) const { return ptr_ != x.ptr_; } + bool operator<(const_ptr<T> const& x) const { return ptr_ < x.ptr_; } + bool operator>(const_ptr<T> const& x) const { return ptr_ > x.ptr_; } + bool operator<=(const_ptr<T> const& x) const { return ptr_ <= x.ptr_; } + bool operator>=(const_ptr<T> const& x) const { return ptr_ >= x.ptr_; } }; template <class T> - class const_pointer + class const_ptr { friend class allocator<T>; T* ptr_; - const_pointer(T* ptr) : ptr_(ptr) {} + const_ptr(T* ptr) : ptr_(ptr) {} public: - const_pointer() : ptr_(0) {} - const_pointer(pointer<T> const& x) : ptr_(x.ptr_) {} + const_ptr() : ptr_(0) {} + const_ptr(ptr<T> const& x) : ptr_(x.ptr_) {} - typedef void (const_pointer::*bool_type)() const; + typedef void (const_ptr::*bool_type)() const; void this_type_does_not_support_comparisons() const {} T& operator*() const { return *ptr_; } T* operator->() const { return ptr_; } - const_pointer& operator++() { ++ptr_; return *this; } - const_pointer operator++(int) { const_pointer tmp(*this); ++ptr_; return tmp; } - const_pointer operator+(int s) const { return const_pointer(ptr_ + s); } + const_ptr& operator++() { ++ptr_; return *this; } + const_ptr operator++(int) { const_ptr tmp(*this); ++ptr_; return tmp; } + const_ptr operator+(int s) const { return const_ptr(ptr_ + s); } T& operator[](int s) const { return ptr_[s]; } bool operator!() const { return !ptr_; } operator bool_type() const { return ptr_ ? - &const_pointer::this_type_does_not_support_comparisons + &const_ptr::this_type_does_not_support_comparisons : 0; } - bool operator==(pointer<T> const& x) const { return ptr_ == x.ptr_; } - bool operator!=(pointer<T> const& x) const { return ptr_ != x.ptr_; } - bool operator<(pointer<T> const& x) const { return ptr_ < x.ptr_; } - bool operator>(pointer<T> const& x) const { return ptr_ > x.ptr_; } - bool operator<=(pointer<T> const& x) const { return ptr_ <= x.ptr_; } - bool operator>=(pointer<T> const& x) const { return ptr_ >= x.ptr_; } + bool operator==(ptr<T> const& x) const { return ptr_ == x.ptr_; } + bool operator!=(ptr<T> const& x) const { return ptr_ != x.ptr_; } + bool operator<(ptr<T> const& x) const { return ptr_ < x.ptr_; } + bool operator>(ptr<T> const& x) const { return ptr_ > x.ptr_; } + bool operator<=(ptr<T> const& x) const { return ptr_ <= x.ptr_; } + bool operator>=(ptr<T> const& x) const { return ptr_ >= x.ptr_; } - bool operator==(const_pointer const& x) const { return ptr_ == x.ptr_; } - bool operator!=(const_pointer const& x) const { return ptr_ != x.ptr_; } - bool operator<(const_pointer const& x) const { return ptr_ < x.ptr_; } - bool operator>(const_pointer const& x) const { return ptr_ > x.ptr_; } - bool operator<=(const_pointer const& x) const { return ptr_ <= x.ptr_; } - bool operator>=(const_pointer const& x) const { return ptr_ >= x.ptr_; } + bool operator==(const_ptr const& x) const { return ptr_ == x.ptr_; } + bool operator!=(const_ptr const& x) const { return ptr_ != x.ptr_; } + bool operator<(const_ptr const& x) const { return ptr_ < x.ptr_; } + bool operator>(const_ptr const& x) const { return ptr_ > x.ptr_; } + bool operator<=(const_ptr const& x) const { return ptr_ <= x.ptr_; } + bool operator>=(const_ptr const& x) const { return ptr_ >= x.ptr_; } }; template <class T> @@ -165,8 +165,8 @@ public: typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef pointer<T> pointer; - typedef const_pointer<T> const_pointer; + typedef ptr<T> pointer; + typedef const_ptr<T> const_pointer; typedef T& reference; typedef T const& const_reference; typedef T value_type; |