feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

Fix hard compilation error with nested fusion::cons.

Browse Source
This commit is contained in:
Louis Dionne
2014-11-11 10:23:36 -05:00
parent b637f2569b
commit d93e675408
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/fusion/container/list/cons.hpp
View File

@ -27,7 +27,6 @@
#include <boost/fusion/support/sequence_base.hpp> #include <boost/fusion/support/sequence_base.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/mpl/or.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
@ -75,10 +74,7 @@ namespace boost { namespace fusion
cons( cons(
Sequence const& seq Sequence const& seq
, typename boost::disable_if< , typename boost::disable_if<
mpl::or_< is_convertible<Sequence, Car> // use copy to car instead
is_convertible<Sequence, cons> // use copy ctor instead
, is_convertible<Sequence, Car> // use copy to car instead
>
>::type* /*dummy*/ = 0 >::type* /*dummy*/ = 0
) )
: car(*fusion::begin(seq)) : car(*fusion::begin(seq))

7
test/sequence/cons.cpp
View File

@ -16,6 +16,7 @@
#include <boost/lambda/lambda.hpp> #include <boost/lambda/lambda.hpp>
#include <boost/fusion/algorithm/iteration/for_each.hpp> #include <boost/fusion/algorithm/iteration/for_each.hpp>
#include <boost/fusion/algorithm/transformation/filter_if.hpp> #include <boost/fusion/algorithm/transformation/filter_if.hpp>
#include <boost/fusion/algorithm/transformation/push_front.hpp>
#include <boost/fusion/sequence/io/out.hpp> #include <boost/fusion/sequence/io/out.hpp>
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
@ -83,6 +84,12 @@ main()
BOOST_TEST((*begin(tie) == 3)); BOOST_TEST((*begin(tie) == 3));
} }
{
// This used to trigger a hard compilation error:
cons<cons<int> > xs;
begin(push_front(xs, 3));
}
return boost::report_errors(); return boost::report_errors();
} }