Fix for bug #7815

[SVN r82129]
2012-12-20 21:54:29 +00:00
parent 52547227d9
commit d02b0dddcd
4 changed files with 23 additions and 3 deletions
@@ -18,6 +18,7 @@
      #include <boost/intrusive/detail/config_begin.hpp>
      #include <boost/intrusive/detail/workaround.hpp>
      #include <boost/intrusive/detail/preprocessor.hpp>
+      #include <boost/intrusive/detail/mpl.hpp>
      #include <boost/static_assert.hpp>
      #include <boost/move/move.hpp>

@@ -85,7 +86,7 @@
            void BOOST_INTRUSIVE_HAS_MEMBER_FUNCTION_CALLABLE_WITH_FUNCNAME();
         };

-         struct Base : public Type, public BaseMixin { Base(); };
+         struct Base : public ::boost::intrusive::detail::remove_cv<Type>::type, public BaseMixin { Base(); };
         template <typename T, T t> class Helper{};

         template <typename U>
@@ -311,6 +311,22 @@ template<typename T>
 struct remove_const<const T>
 {  typedef T type;   };

+template<typename T>
+struct remove_cv
+{  typedef  T type;   };
+
+template<typename T>
+struct remove_cv<const T>
+{  typedef T type;   };
+
+template<typename T>
+struct remove_cv<const volatile T>
+{  typedef T type;   };
+
+template<typename T>
+struct remove_cv<volatile T>
+{  typedef T type;   };
+
 template<class T>
 struct remove_reference
 {