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

Merge pull request #26 from ldionne/master

Browse Source 
Improve support for constexpr in fusion::nil and its iterators.
This commit is contained in:
Joel de Guzman
2014-10-28 08:12:04 +08:00
parent c704efb49c
commit d5eb1e793c
4 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/fusion/container/list/cons_iterator.hpp
View File

@ -55,45 +55,45 @@ namespace boost { namespace fusion
typedef cons_iterator_identity< typedef cons_iterator_identity<
add_const<nil_>::type> add_const<nil_>::type>
identity; identity;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
nil_iterator() {} nil_iterator() {}
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
explicit nil_iterator(nil_ const&) {} explicit nil_iterator(nil_ const&) {}
}; };
template <> template <>
struct cons_iterator<nil_> : nil_iterator struct cons_iterator<nil_> : nil_iterator
{ {
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
cons_iterator() {} cons_iterator() {}
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
explicit cons_iterator(nil_ const&) {} explicit cons_iterator(nil_ const&) {}
}; };
template <> template <>
struct cons_iterator<nil_ const> : nil_iterator struct cons_iterator<nil_ const> : nil_iterator
{ {
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
cons_iterator() {} cons_iterator() {}
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
explicit cons_iterator(nil_ const&) {} explicit cons_iterator(nil_ const&) {}
}; };
template <> template <>
struct cons_iterator<list<> > : nil_iterator struct cons_iterator<list<> > : nil_iterator
{ {
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
cons_iterator() {} cons_iterator() {}
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
explicit cons_iterator(nil_ const&) {} explicit cons_iterator(nil_ const&) {}
}; };
template <> template <>
struct cons_iterator<list<> const> : nil_iterator struct cons_iterator<list<> const> : nil_iterator
{ {
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
cons_iterator() {} cons_iterator() {}
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
explicit cons_iterator(nil_ const&) {} explicit cons_iterator(nil_ const&) {}
}; };
}} }}

4
include/boost/fusion/container/list/nil.hpp
View File

@ -31,11 +31,11 @@ namespace boost { namespace fusion
typedef void_ car_type; typedef void_ car_type;
typedef void_ cdr_type; typedef void_ cdr_type;
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
nil_() {} nil_() {}
template <typename Iterator> template <typename Iterator>
BOOST_FUSION_GPU_ENABLED BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
nil_(Iterator const& /*iter*/, mpl::true_ /*this_is_an_iterator*/) nil_(Iterator const& /*iter*/, mpl::true_ /*this_is_an_iterator*/)
{} {}

1
test/Jamfile
View File

@ -100,6 +100,7 @@ project
[ run sequence/map_move.cpp : : : : ] [ run sequence/map_move.cpp : : : : ]
[ run sequence/map_mutate.cpp : : : : ] [ run sequence/map_mutate.cpp : : : : ]
[ run sequence/map_tie.cpp : : : : ] [ run sequence/map_tie.cpp : : : : ]
[ run sequence/nil.cpp : : : : ]
[ run sequence/nview.cpp : : : : ] [ run sequence/nview.cpp : : : : ]
[ run sequence/reverse_view.cpp : : : : ] [ run sequence/reverse_view.cpp : : : : ]
[ run sequence/segmented_iterator_range.cpp : : : : ] [ run sequence/segmented_iterator_range.cpp : : : : ]

25
test/sequence/nil.cpp Normal file
View File

@ -0,0 +1,25 @@
/*=============================================================================
Copyright (c) 2014 Louis Dionne
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/detail/lightweight_test.hpp>
#include <boost/fusion/container/list/cons_iterator.hpp>
#include <boost/fusion/container/list/nil.hpp>
#include <boost/fusion/support/config.hpp>
#include <boost/mpl/bool.hpp>
int main() {
using namespace boost::fusion;
// nil should be constexpr constructible
{
BOOST_CONSTEXPR nil x1 = nil();
BOOST_CONSTEXPR nil x2 = nil(nil_iterator(), boost::mpl::true_());
(void)x1; (void)x2;
}
return boost::report_errors();
}