boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-25 18:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a regression with msvc 10/11/12 defect

Browse Source
This commit is contained in:
Kohei Takahashi
2017-11-23 22:48:11 +09:00
parent 5fd8c36079
commit 4eda545405
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fusion/container/vector/detail/cpp03/vector.hpp
View File

@ -1,5 +1,6 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2001-2011 Joel de Guzman Copyright (c) 2001-2011 Joel de Guzman
Copyright (c) 2017 Kohei Takahashi
Distributed under the Boost Software License, Version 1.0. (See accompanying Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -22,6 +23,7 @@
#include <boost/type_traits/add_reference.hpp> #include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp> #include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/is_base_of.hpp> #include <boost/type_traits/is_base_of.hpp>
#include <boost/type_traits/remove_cv_ref.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/core/enable_if.hpp> #include <boost/core/enable_if.hpp>
@ -178,7 +180,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template <typename T> template <typename T>
BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
typename boost::disable_if_c< 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& , vector&
>::type >::type
operator=(T&& rhs) operator=(T&& rhs)

2
include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
View File

@ -66,7 +66,7 @@ FUSION_HASH endif
#endif #endif
vector(BOOST_PP_ENUM_BINARY_PARAMS(M, U, && arg) vector(BOOST_PP_ENUM_BINARY_PARAMS(M, U, && arg)
#if M == 1 #if M == 1
, 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
#endif #endif
) )
: vec(BOOST_PP_ENUM(M, FUSION_FORWARD_CTOR_FORWARD, arg)) {} : vec(BOOST_PP_ENUM(M, FUSION_FORWARD_CTOR_FORWARD, arg)) {}