diff --git a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp
index 531b4fd2..12b7a570 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector10.hpp
@@ -66,7 +66,7 @@ namespace boost { namespace fusion
     BOOST_FUSION_GPU_ENABLED
     explicit
     vector(U0 && arg0
-        , typename boost::disable_if_c<boost::is_same<vector const, typename boost::remove_reference<U0>::type const>::value, detail::enabler_>::type = detail::enabler
+        , typename boost::disable_if_c<boost::is_same<vector, typename boost::remove_cv_ref<U0>::type>::value, detail::enabler_>::type = detail::enabler
         )
         : vec(std::forward<U0>( arg0)) {}
 # endif
@@ -269,7 +269,7 @@ namespace boost { namespace fusion
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::disable_if_c<
-            boost::is_same<vector const, typename boost::remove_reference<T>::type const>::value
+            boost::is_same<vector, typename boost::remove_cv_ref<T>::type>::value
           , vector&
         >::type
         operator=(T&& rhs)
diff --git a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp
index 7f64d392..9c64ef05 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector20.hpp
@@ -66,7 +66,7 @@ namespace boost { namespace fusion
     BOOST_FUSION_GPU_ENABLED
     explicit
     vector(U0 && arg0
-        , typename boost::disable_if_c<boost::is_same<vector const, typename boost::remove_reference<U0>::type const>::value, detail::enabler_>::type = detail::enabler
+        , typename boost::disable_if_c<boost::is_same<vector, typename boost::remove_cv_ref<U0>::type>::value, detail::enabler_>::type = detail::enabler
         )
         : vec(std::forward<U0>( arg0)) {}
 # endif
@@ -449,7 +449,7 @@ namespace boost { namespace fusion
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::disable_if_c<
-            boost::is_same<vector const, typename boost::remove_reference<T>::type const>::value
+            boost::is_same<vector, typename boost::remove_cv_ref<T>::type>::value
           , vector&
         >::type
         operator=(T&& rhs)
diff --git a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp
index b35c17ae..9df40b53 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector30.hpp
@@ -66,7 +66,7 @@ namespace boost { namespace fusion
     BOOST_FUSION_GPU_ENABLED
     explicit
     vector(U0 && arg0
-        , typename boost::disable_if_c<boost::is_same<vector const, typename boost::remove_reference<U0>::type const>::value, detail::enabler_>::type = detail::enabler
+        , typename boost::disable_if_c<boost::is_same<vector, typename boost::remove_cv_ref<U0>::type>::value, detail::enabler_>::type = detail::enabler
         )
         : vec(std::forward<U0>( arg0)) {}
 # endif
@@ -629,7 +629,7 @@ namespace boost { namespace fusion
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::disable_if_c<
-            boost::is_same<vector const, typename boost::remove_reference<T>::type const>::value
+            boost::is_same<vector, typename boost::remove_cv_ref<T>::type>::value
           , vector&
         >::type
         operator=(T&& rhs)
diff --git a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp
index ccac354d..5da47eeb 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector40.hpp
@@ -66,7 +66,7 @@ namespace boost { namespace fusion
     BOOST_FUSION_GPU_ENABLED
     explicit
     vector(U0 && arg0
-        , typename boost::disable_if_c<boost::is_same<vector const, typename boost::remove_reference<U0>::type const>::value, detail::enabler_>::type = detail::enabler
+        , typename boost::disable_if_c<boost::is_same<vector, typename boost::remove_cv_ref<U0>::type>::value, detail::enabler_>::type = detail::enabler
         )
         : vec(std::forward<U0>( arg0)) {}
 # endif
@@ -809,7 +809,7 @@ namespace boost { namespace fusion
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::disable_if_c<
-            boost::is_same<vector const, typename boost::remove_reference<T>::type const>::value
+            boost::is_same<vector, typename boost::remove_cv_ref<T>::type>::value
           , vector&
         >::type
         operator=(T&& rhs)
diff --git a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp
index 16d8f0cc..47e878bc 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/preprocessed/vvector50.hpp
@@ -66,7 +66,7 @@ namespace boost { namespace fusion
     BOOST_FUSION_GPU_ENABLED
     explicit
     vector(U0 && arg0
-        , typename boost::disable_if_c<boost::is_same<vector const, typename boost::remove_reference<U0>::type const>::value, detail::enabler_>::type = detail::enabler
+        , typename boost::disable_if_c<boost::is_same<vector, typename boost::remove_cv_ref<U0>::type>::value, detail::enabler_>::type = detail::enabler
         )
         : vec(std::forward<U0>( arg0)) {}
 # endif
@@ -989,7 +989,7 @@ namespace boost { namespace fusion
         template <typename T>
         BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::disable_if_c<
-            boost::is_same<vector const, typename boost::remove_reference<T>::type const>::value
+            boost::is_same<vector, typename boost::remove_cv_ref<T>::type>::value
           , vector&
         >::type
         operator=(T&& rhs)