#include <boost/type_traits/is_same.hpp>
#include <boost/call_traits.hpp>
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable:4512)
+#endif
namespace boost
{
template <class T1, class T2>
class compressed_pair_imp<T1, T2, 1>
- : private T1
+ : protected ::boost::remove_cv<T1>::type
{
public:
typedef T1 first_type;
template <class T1, class T2>
class compressed_pair_imp<T1, T2, 2>
- : private T2
+ : protected ::boost::remove_cv<T2>::type
{
public:
typedef T1 first_type;
template <class T1, class T2>
class compressed_pair_imp<T1, T2, 3>
- : private T1,
- private T2
+ : protected ::boost::remove_cv<T1>::type,
+ protected ::boost::remove_cv<T2>::type
{
public:
typedef T1 first_type;
// JM
// 4 T1 == T2, T1 and T2 both empty
- // Note does not actually store an instance of T2 at all -
- // but reuses T1 base class for both first() and second().
+ // Originally this did not store an instance of T2 at all
+ // 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>
class compressed_pair_imp<T1, T2, 4>
- : private T1
+ : protected ::boost::remove_cv<T1>::type
{
public:
typedef T1 first_type;
} // boost
-#endif // BOOST_DETAIL_COMPRESSED_PAIR_HPP
-
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
+#endif // BOOST_DETAIL_COMPRESSED_PAIR_HPP