From a2e32493bb3ed30b536aaf2f3127973958be2e14 Mon Sep 17 00:00:00 2001 From: Joel de Guzman Date: Wed, 12 Nov 2014 07:35:19 +0800 Subject: [PATCH] Merge pull request #37 from ldionne/develop Use BOOST_CONSTEXPR instead of (nonexistant) BOOST_CXX14_CONSTEXPR. (reverted from commit 3280267ed4c6a5fbd3b1f6b195c7a8f62a776cbe) --- include/boost/fusion/iterator/basic_iterator.hpp | 2 +- include/boost/fusion/sequence/intrinsic/swap.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/fusion/iterator/basic_iterator.hpp b/include/boost/fusion/iterator/basic_iterator.hpp index 0630c05e..5d484132 100644 --- a/include/boost/fusion/iterator/basic_iterator.hpp +++ b/include/boost/fusion/iterator/basic_iterator.hpp @@ -132,7 +132,7 @@ namespace boost { namespace fusion {} template - BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED basic_iterator& operator=(basic_iterator const& it) { diff --git a/include/boost/fusion/sequence/intrinsic/swap.hpp b/include/boost/fusion/sequence/intrinsic/swap.hpp index 1b8c9518..6eca3146 100644 --- a/include/boost/fusion/sequence/intrinsic/swap.hpp +++ b/include/boost/fusion/sequence/intrinsic/swap.hpp @@ -40,7 +40,7 @@ namespace boost { namespace fusion { }; template - BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED void operator()(Elem const& e) const { using std::swap; @@ -50,7 +50,7 @@ namespace boost { namespace fusion { } template - BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED + BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED typename enable_if, traits::is_sequence >, void>::type swap(Seq1& lhs, Seq2& rhs) {