From bcc2530f1941ad18802b4ae9623cc69166e20aa0 Mon Sep 17 00:00:00 2001
From: Kohei Takahashi <flast@flast.jp>
Date: Fri, 17 Oct 2014 16:44:57 +0900
Subject: [PATCH] Do not expand BOOST_{CXX14_}CONSTEXPR while preprocessing.

Signed-off-by: Kohei Takahashi <flast@flast.jp>
---
 .../detail/preprocessed/iter_fold.hpp         | 22 +++++++++----------
 .../detail/preprocessed/reverse_fold.hpp      | 22 +++++++++----------
 .../detail/preprocessed/reverse_iter_fold.hpp | 22 +++++++++----------
 preprocess/wave.cfg                           |  2 ++
 4 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
index 1211550d..f936acb1 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/iter_fold.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion
         struct unrolled_iter_fold
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -64,7 +64,7 @@ namespace boost { namespace fusion
         struct unrolled_iter_fold<Result,3>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -91,7 +91,7 @@ namespace boost { namespace fusion
         struct unrolled_iter_fold<Result,2>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -106,7 +106,7 @@ namespace boost { namespace fusion
         struct unrolled_iter_fold<Result,1>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -118,7 +118,7 @@ namespace boost { namespace fusion
         struct unrolled_iter_fold<Result,0>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const&, F)
             {
@@ -281,7 +281,7 @@ namespace boost { namespace fusion
                   , SeqSize
                 >::type
             type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(StateRef state, Seq& seq, F f)
             {
@@ -301,7 +301,7 @@ namespace boost { namespace fusion
         struct iter_fold_impl<0,StateRef,Seq,F>
         {
             typedef StateRef type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static StateRef
             call(StateRef state, Seq&, F)
             {
@@ -333,7 +333,7 @@ namespace boost { namespace fusion
         {};
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq
       , State const
@@ -347,7 +347,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq const
       , State const
@@ -361,7 +361,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq
       , State const
@@ -375,7 +375,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::iter_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
index cc78231a..4413ee45 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_fold.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_fold
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -64,7 +64,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_fold<Result,3>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -91,7 +91,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_fold<Result,2>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -106,7 +106,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_fold<Result,1>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -118,7 +118,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_fold<Result,0>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const&, F)
             {
@@ -281,7 +281,7 @@ namespace boost { namespace fusion
                   , SeqSize
                 >::type
             type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(StateRef state, Seq& seq, F f)
             {
@@ -301,7 +301,7 @@ namespace boost { namespace fusion
         struct reverse_fold_impl<0,StateRef,Seq,F>
         {
             typedef StateRef type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static StateRef
             call(StateRef state, Seq&, F)
             {
@@ -333,7 +333,7 @@ namespace boost { namespace fusion
         {};
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq
       , State const
@@ -347,7 +347,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq const
       , State const
@@ -361,7 +361,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq
       , State const
@@ -375,7 +375,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_fold<
         Seq const
       , State const
diff --git a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
index 3023a912..e3020e26 100644
--- a/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/preprocessed/reverse_iter_fold.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_iter_fold
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -64,7 +64,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_iter_fold<Result,3>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -91,7 +91,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_iter_fold<Result,2>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -106,7 +106,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_iter_fold<Result,1>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const& it0,F f)
             {
@@ -118,7 +118,7 @@ namespace boost { namespace fusion
         struct unrolled_reverse_iter_fold<Result,0>
         {
             template<typename State, typename It0, typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static Result
             call(State const& state,It0 const&, F)
             {
@@ -281,7 +281,7 @@ namespace boost { namespace fusion
                   , SeqSize
                 >::type
             type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(StateRef state, Seq& seq, F f)
             {
@@ -301,7 +301,7 @@ namespace boost { namespace fusion
         struct reverse_iter_fold_impl<0,StateRef,Seq,F>
         {
             typedef StateRef type;
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static StateRef
             call(StateRef state, Seq&, F)
             {
@@ -333,7 +333,7 @@ namespace boost { namespace fusion
         {};
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq
       , State const
@@ -347,7 +347,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq const
       , State const
@@ -361,7 +361,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq
       , State const
@@ -375,7 +375,7 @@ namespace boost { namespace fusion
             f);
     }
     template<typename Seq, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::reverse_iter_fold<
         Seq const
       , State const
diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg
index 35a6881a..3cde502f 100644
--- a/preprocess/wave.cfg
+++ b/preprocess/wave.cfg
@@ -10,6 +10,8 @@
 -D_M_IX86
 -NBOOST_STATIC_ASSERT
 -NBOOST_FORCEINLINE
+-NBOOST_CONSTEXPR
+-NBOOST_CXX14_CONSTEXPR
 -NBOOST_MPL_ASSERT
 -NBOOST_MPL_ASSERT_MSG
 -NBOOST_MPL_ASSERT_RELATION