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

Merge pull request #92 from Flast/bugfix/issue-11140

Browse Source 
Fix a issue with nested fusion::tuple.
This commit is contained in:
Joel de Guzman
2015-07-27 15:26:10 +08:00
parent e0debe282c 4fa0a5f550
commit b1bb9921e2
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fusion/tuple/detail/tuple.hpp
View File

@ -52,7 +52,7 @@ namespace boost { namespace fusion
: base_type() {} : base_type() {}
BOOST_FUSION_GPU_ENABLED tuple(tuple const& rhs) BOOST_FUSION_GPU_ENABLED tuple(tuple const& rhs)
: base_type(rhs) {} : base_type(static_cast<base_type const&>(rhs)) {}
template <typename U1, typename U2> template <typename U1, typename U2>
BOOST_FUSION_GPU_ENABLED BOOST_FUSION_GPU_ENABLED
@ -72,7 +72,7 @@ namespace boost { namespace fusion
BOOST_FUSION_GPU_ENABLED BOOST_FUSION_GPU_ENABLED
tuple& operator=(tuple const& rhs) tuple& operator=(tuple const& rhs)
{ {
base_type::operator=(rhs); base_type::operator=(static_cast<base_type const&>(rhs));
return *this; return *this;
} }

1
test/Jamfile
View File

@ -122,6 +122,7 @@ project
[ run sequence/tuple_make.cpp : : : : ] [ run sequence/tuple_make.cpp : : : : ]
[ run sequence/tuple_misc.cpp : : : : ] [ run sequence/tuple_misc.cpp : : : : ]
[ run sequence/tuple_mutate.cpp : : : : ] [ run sequence/tuple_mutate.cpp : : : : ]
[ run sequence/tuple_nest.cpp : : : : ]
[ run sequence/tuple_hash.cpp : : : : ] [ run sequence/tuple_hash.cpp : : : : ]
[ run sequence/tuple_tie.cpp : : : : ] [ run sequence/tuple_tie.cpp : : : : ]
[ run sequence/transform_view.cpp : : : : ] [ run sequence/transform_view.cpp : : : : ]

19
test/sequence/tuple_nest.cpp Normal file
View File

@ -0,0 +1,19 @@
/*=============================================================================
Copyright (C) 2015 Kohei Takahshi
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)
==============================================================================*/
#include <boost/fusion/tuple/tuple.hpp>
#include <boost/core/lightweight_test.hpp>
#define FUSION_SEQUENCE tuple
#include "nest.hpp"
int
main()
{
test();
return boost::report_errors();
}