Merge pull request #26 from ldionne/master

Improve support for constexpr in fusion::nil and its iterators.
2014-10-28 08:12:04 +08:00
parent c704efb49c
commit d5eb1e793c
4 changed files with 38 additions and 12 deletions
--- a/include/boost/fusion/container/list/nil.hpp
+++ b/include/boost/fusion/container/list/nil.hpp
@ -31,11 +31,11 @@ namespace boost { namespace fusion
        typedef void_ car_type;
        typedef void_ cdr_type;

-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
        nil_() {}

        template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
        nil_(Iterator const& /*iter*/, mpl::true_ /*this_is_an_iterator*/)
        {}