boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 15:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added explicit static_casts when casting *this to a reference-to-base-class: it keeps Digital Mars happy apparently.

Browse Source 
[SVN r32413]
This commit is contained in:
John Maddock 2006-01-25 10:45:26 +00:00
parent f66e844ff1
commit 7594e00460
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/boost/detail/compressed_pair.hpp
View File

@ -155,8 +155,8 @@ namespace details
compressed_pair_imp(second_param_type y) compressed_pair_imp(second_param_type y)
: second_(y) {} : second_(y) {}
first_reference first() {return *this;} first_reference first() {return static_cast<first_reference>(*this);}
first_const_reference first() const {return *this;} first_const_reference first() const {return static_cast<first_const_reference>(*this);}
second_reference second() {return second_;} second_reference second() {return second_;}
second_const_reference second() const {return second_;} second_const_reference second() const {return second_;}
@ -200,8 +200,8 @@ namespace details
first_reference first() {return first_;} first_reference first() {return first_;}
first_const_reference first() const {return first_;} first_const_reference first() const {return first_;}
second_reference second() {return *this;} second_reference second() {return static_cast<second_reference>(*this);}
second_const_reference second() const {return *this;} second_const_reference second() const {return static_cast<second_const_reference>(*this);}
void swap(::boost::compressed_pair<T1,T2>& y) void swap(::boost::compressed_pair<T1,T2>& y)
{ {
@ -241,11 +241,11 @@ namespace details
compressed_pair_imp(second_param_type y) compressed_pair_imp(second_param_type y)
: second_type(y) {} : second_type(y) {}
first_reference first() {return *this;} first_reference first() {return static_cast<first_reference>(*this);}
first_const_reference first() const {return *this;} first_const_reference first() const {return static_cast<first_const_reference>(*this);}
second_reference second() {return *this;} second_reference second() {return static_cast<second_reference>(*this);}
second_const_reference second() const {return *this;} second_const_reference second() const {return static_cast<second_const_reference>(*this);}
// //
// no need to swap empty bases: // no need to swap empty bases:
void swap(::boost::compressed_pair<T1,T2>&) {} void swap(::boost::compressed_pair<T1,T2>&) {}
@ -253,8 +253,11 @@ namespace details
// JM // JM
// 4 T1 == T2, T1 and T2 both empty // 4 T1 == T2, T1 and T2 both empty
// Note does not actually store an instance of T2 at all - // Originally this did not store an instance of T2 at all
// but reuses T1 base class for both first() and second(). // but that led to problems beause it meant &x.first() == &x.second()
// which is not true for any other kind of pair, so now we store an instance
// of T2 just in case the user is relying on first() and second() returning
// different objects (albeit both empty).
template <class T1, class T2> template <class T1, class T2>
class compressed_pair_imp<T1, T2, 4> class compressed_pair_imp<T1, T2, 4>
: private ::boost::remove_cv<T1>::type : private ::boost::remove_cv<T1>::type
@ -277,8 +280,8 @@ namespace details
compressed_pair_imp(first_param_type x) compressed_pair_imp(first_param_type x)
: first_type(x), m_second(x) {} : first_type(x), m_second(x) {}
first_reference first() {return *this;} first_reference first() {return static_cast<first_reference>(*this);}
first_const_reference first() const {return *this;} first_const_reference first() const {return static_cast<first_const_reference>(*this);}
second_reference second() {return m_second;} second_reference second() {return m_second;}
second_const_reference second() const {return m_second;} second_const_reference second() const {return m_second;}