Workaround for nonconformance to CWG issue 298, checked in on behalf of John Maddock

[SVN r29415]
This commit is contained in:
Dave Abrahams 2005-06-03 19:11:54 +00:00
parent 6ea398c446
commit 5a4e19989f

View File

@ -132,7 +132,7 @@ namespace details
template <class T1, class T2> template <class T1, class T2>
class compressed_pair_imp<T1, T2, 1> class compressed_pair_imp<T1, T2, 1>
: private T1 : private ::boost::remove_cv<T1>::type
{ {
public: public:
typedef T1 first_type; typedef T1 first_type;
@ -174,7 +174,7 @@ namespace details
template <class T1, class T2> template <class T1, class T2>
class compressed_pair_imp<T1, T2, 2> class compressed_pair_imp<T1, T2, 2>
: private T2 : private ::boost::remove_cv<T2>::type
{ {
public: public:
typedef T1 first_type; typedef T1 first_type;
@ -217,8 +217,8 @@ namespace details
template <class T1, class T2> template <class T1, class T2>
class compressed_pair_imp<T1, T2, 3> class compressed_pair_imp<T1, T2, 3>
: private T1, : private ::boost::remove_cv<T1>::type,
private T2 private ::boost::remove_cv<T2>::type
{ {
public: public:
typedef T1 first_type; typedef T1 first_type;
@ -257,7 +257,7 @@ namespace details
// but reuses T1 base class for both first() and second(). // but reuses T1 base class for both first() and second().
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 T1 : private ::boost::remove_cv<T1>::type
{ {
public: public:
typedef T1 first_type; typedef T1 first_type;
@ -430,5 +430,3 @@ swap(compressed_pair<T1, T2>& x, compressed_pair<T1, T2>& y)
#endif // BOOST_DETAIL_COMPRESSED_PAIR_HPP #endif // BOOST_DETAIL_COMPRESSED_PAIR_HPP