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

workaround for vc++ mistakenly calling constructor from T instead of copy constructor when T is derived from vector.

Browse Source 
[SVN r35553]
This commit is contained in:
Joel de Guzman
2006-10-11 12:10:06 +00:00
parent 521574b39d
commit fc434bd837
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/fusion/sequence/container/vector/vector.hpp
View File

@ -16,6 +16,8 @@
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#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/detail/workaround.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
@ -51,9 +53,16 @@ namespace boost { namespace fusion
vector(vector<BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, U)> const& rhs) vector(vector<BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, U)> const& rhs)
: vec(rhs.vec) {} : vec(rhs.vec) {}
vector(vector const& rhs)
: vec(rhs.vec) {}
template <typename T> template <typename T>
explicit vector(T const& rhs) explicit vector(T const& rhs)
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
: vec(ctor_helper(rhs, is_base_of<vector, T>())) {}
#else
: vec(rhs) {} : vec(rhs) {}
#endif
// Expand a couple of forwarding constructors for arguments // Expand a couple of forwarding constructors for arguments
// of type (T0), (T0, T1), (T0, T1, T2) etc. Example: // of type (T0), (T0, T1), (T0, T1, T2) etc. Example:
@ -117,10 +126,25 @@ namespace boost { namespace fusion
>::type >::type
at_impl(I index) const at_impl(I index) const
{ {
return vec.at_impl(mpl::int_<I::value>()); return vec.at_impl(mpl::int_<I::value>());
} }
private: private:
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
static vector_n const&
ctor_helper(vector const& rhs, mpl::true_)
{
return rhs.vec;
}
template <typename T>
static T const&
ctor_helper(T const& rhs, mpl::false_)
{
return rhs;
}
#endif
vector_n vec; vector_n vec;
}; };