diff --git a/include/boost/fusion/adapted/adt/detail/adapt_base.hpp b/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
index 3de396dd..23673886 100644
--- a/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
+++ b/include/boost/fusion/adapted/adt/detail/adapt_base.hpp
@@ -17,6 +17,12 @@
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 
+#if defined(BOOST_GCC)
+#define BOOST_FUSION_ADT_CONSTEXPR BOOST_CXX14_CONSTEXPR
+#else
+#define BOOST_FUSION_ADT_CONSTEXPR BOOST_CONSTEXPR
+#endif
+
 #define BOOST_FUSION_ADAPT_ADT_GET_IDENTITY_TEMPLATE_IMPL(TEMPLATE_PARAMS_SEQ)  \
     typename detail::get_identity<                                              \
         lvalue                                                                  \
@@ -40,7 +46,7 @@
     >                                                                           \
     {                                                                           \
         template<class Val>                                                     \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                          \
         static void                                                             \
         boost_fusion_adapt_adt_impl_set(                                        \
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj,               \
@@ -49,7 +55,7 @@
             BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 3, ATTRIBUTE);            \
         }                                                                       \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_FUSION_ADT_CONSTEXPR BOOST_FUSION_GPU_ENABLED                     \
         static BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 0, ATTRIBUTE)          \
         boost_fusion_adapt_adt_impl_get(                                        \
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj)               \
@@ -57,7 +63,7 @@
             return BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 2, ATTRIBUTE);     \
         }                                                                       \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_FUSION_ADT_CONSTEXPR BOOST_FUSION_GPU_ENABLED                     \
         static BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 1, ATTRIBUTE)          \
         boost_fusion_adapt_adt_impl_get(                                        \
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ) const& obj)         \
@@ -77,14 +83,14 @@
     {                                                                           \
         typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 1, ATTRIBUTE) type;   \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         explicit                                                                \
         adt_attribute_proxy(                                                    \
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ) const& o)           \
           : obj(&o)                                                             \
         {}                                                                      \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_FUSION_ADT_CONSTEXPR BOOST_FUSION_GPU_ENABLED                     \
         type get() const                                                        \
         {                                                                       \
             return access::adt_attribute_access<                                \
@@ -93,7 +99,7 @@
             >::boost_fusion_adapt_adt_impl_get(*obj);                           \
         }                                                                       \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_FUSION_ADT_CONSTEXPR BOOST_FUSION_GPU_ENABLED                     \
         operator type() const                                                   \
         {                                                                       \
             return get();                                                       \
@@ -113,7 +119,7 @@
     {                                                                           \
         typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 0, ATTRIBUTE) type;   \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         explicit                                                                \
         adt_attribute_proxy(                                                    \
             BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& o)                 \
@@ -121,7 +127,7 @@
         {}                                                                      \
                                                                                 \
         template<class Val>                                                     \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                          \
         adt_attribute_proxy&                                                    \
         operator=(Val const& val)                                               \
         {                                                                       \
@@ -132,7 +138,7 @@
             return *this;                                                       \
         }                                                                       \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_FUSION_ADT_CONSTEXPR BOOST_FUSION_GPU_ENABLED                     \
         type get() const                                                        \
         {                                                                       \
             return access::adt_attribute_access<                                \
@@ -141,7 +147,7 @@
             >::boost_fusion_adapt_adt_impl_get(*obj);                           \
         }                                                                       \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_FUSION_ADT_CONSTEXPR BOOST_FUSION_GPU_ENABLED                     \
         operator type() const                                                   \
         {                                                                       \
             return get();                                                       \
@@ -181,7 +187,7 @@
                 >                                                               \
             type;                                                               \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type                                                         \
             call(Seq& obj)                                                      \
             {                                                                   \
diff --git a/include/boost/fusion/adapted/adt/detail/extension.hpp b/include/boost/fusion/adapted/adt/detail/extension.hpp
index 63491180..c7d25895 100644
--- a/include/boost/fusion/adapted/adt/detail/extension.hpp
+++ b/include/boost/fusion/adapted/adt/detail/extension.hpp
@@ -17,7 +17,7 @@
 #include <boost/fusion/adapted/struct/detail/extension.hpp>
 
 namespace boost { namespace fusion
-{ 
+{
     namespace detail
     {
         template <typename T, typename Dummy>
@@ -25,12 +25,12 @@ namespace boost { namespace fusion
           : remove_const<typename remove_reference<T>::type>
         {};
     }
-    
+
     namespace extension
     {
         // Overload as_const() to unwrap adt_attribute_proxy.
         template <typename T, int N, bool Const>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename adt_attribute_proxy<T, N, Const>::type as_const(const adt_attribute_proxy<T, N, Const>& proxy)
         {
             return proxy.get();
diff --git a/include/boost/fusion/adapted/array/at_impl.hpp b/include/boost/fusion/adapted/array/at_impl.hpp
index 084fffc2..369c8e2e 100644
--- a/include/boost/fusion/adapted/array/at_impl.hpp
+++ b/include/boost/fusion/adapted/array/at_impl.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion { namespace extension
                 add_reference<typename remove_extent<Seq>::type>::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/adapted/array/begin_impl.hpp b/include/boost/fusion/adapted/array/begin_impl.hpp
index 4ffaba01..8ea5a00e 100644
--- a/include/boost/fusion/adapted/array/begin_impl.hpp
+++ b/include/boost/fusion/adapted/array/begin_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/adapted/array/deref_impl.hpp b/include/boost/fusion/adapted/array/deref_impl.hpp
index a7dc7cb9..a5719c3a 100644
--- a/include/boost/fusion/adapted/array/deref_impl.hpp
+++ b/include/boost/fusion/adapted/array/deref_impl.hpp
@@ -29,7 +29,7 @@ namespace boost { namespace fusion { namespace extension
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/adapted/array/end_impl.hpp b/include/boost/fusion/adapted/array/end_impl.hpp
index d36c6b81..e4ab63ce 100644
--- a/include/boost/fusion/adapted/array/end_impl.hpp
+++ b/include/boost/fusion/adapted/array/end_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/adapted/boost_array/array_iterator.hpp b/include/boost/fusion/adapted/boost_array/array_iterator.hpp
index 0e39d457..8d85ba9c 100644
--- a/include/boost/fusion/adapted/boost_array/array_iterator.hpp
+++ b/include/boost/fusion/adapted/boost_array/array_iterator.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion
         typedef mpl::int_<Pos> index;
         typedef Array array_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         array_iterator(Array& a)
             : array(a) {}
 
@@ -57,7 +57,7 @@ namespace boost { namespace fusion
                 >::type 
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const & it)
             {
@@ -72,7 +72,7 @@ namespace boost { namespace fusion
             typedef typename Iterator::array_type array_type;
             typedef array_iterator<array_type, index::value + N::value> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& i)
             {
@@ -95,7 +95,7 @@ namespace boost { namespace fusion
                 >::type 
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(I1 const&, I2 const&)
             {
diff --git a/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
index 15235e8e..e355d022 100644
--- a/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
@@ -14,7 +14,7 @@
 #include <boost/mpl/if.hpp>
 
 namespace boost { namespace fusion {
-    
+
     struct boost_array_tag;
 
     namespace extension
@@ -33,7 +33,7 @@ namespace boost { namespace fusion {
                     typename Sequence::const_reference, 
                     typename Sequence::reference>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
index 5e0752c1..8481b765 100644
--- a/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
@@ -24,11 +24,11 @@ namespace boost { namespace fusion {
         struct begin_impl<boost_array_tag>
         {
             template <typename Sequence>
-            struct apply 
+            struct apply
             {
                 typedef array_iterator<Sequence, 0> type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
diff --git a/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
index 13ed1e3e..7574b364 100644
--- a/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
@@ -24,11 +24,11 @@ namespace boost { namespace fusion {
         struct end_impl<boost_array_tag>
         {
             template <typename Sequence>
-            struct apply 
+            struct apply
             {
                 typedef array_iterator<Sequence, Sequence::static_size> type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
diff --git a/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
index cffd4428..47a20a25 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
@@ -40,7 +40,7 @@ namespace boost { namespace fusion
                     >::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
index 33613c20..1d5d392b 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
             {
                 typedef std_tuple_iterator<Sequence, 0> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
diff --git a/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp b/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
index fd96eabf..41e0d434 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion { namespace detail
     struct build_std_tuple<First, Last, true>
     {
         typedef std::tuple<> type;
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const&, Last const&)
         {
@@ -61,14 +61,14 @@ namespace boost { namespace fusion { namespace detail
         typedef std::tuple<T, Rest...> type;
 
         template <int ...I>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         indexed_call(T const& first, std::tuple<Rest...> const& rest, indexed_tuple<I...>)
         {
             return type(first, std::get<I>(rest)...);
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(T const& first, std::tuple<Rest...> const& rest)
         {
@@ -91,7 +91,7 @@ namespace boost { namespace fusion { namespace detail
 
         typedef typename push_front::type type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const& f, Last const& l)
         {
diff --git a/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
index ee079bed..96b67b11 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
 
                 typedef typename gen::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
index 77048698..500b0491 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                 static int const size = std::tuple_size<seq_type>::value;
                 typedef std_tuple_iterator<Sequence, size> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
diff --git a/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp b/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
index c4d957ea..d5803f9c 100644
--- a/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
+++ b/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
@@ -36,7 +36,8 @@ namespace boost { namespace fusion
             typename add_const<Tuple>::type, Index>
         identity;
 
-        BOOST_FUSION_GPU_ENABLED explicit std_tuple_iterator(Tuple& tuple)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit std_tuple_iterator(Tuple& tuple)
           : tuple(tuple) {}
 
         Tuple& tuple;
@@ -58,7 +59,7 @@ namespace boost { namespace fusion
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& iter)
             {
@@ -73,7 +74,7 @@ namespace boost { namespace fusion
             typedef typename Iterator::tuple_type tuple_type;
             typedef std_tuple_iterator<tuple_type, index+N::value> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& i)
             {
@@ -96,7 +97,7 @@ namespace boost { namespace fusion
         {
             typedef mpl::int_<Last::index-First::index> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(First const&, Last const&)
             {
diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base.hpp
index db702ae1..2a0fcf7c 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_base.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_base.hpp
@@ -138,7 +138,7 @@
                 >::type                                                         \
             type;                                                               \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type                                                         \
             call(Seq& seq)                                                      \
             {                                                                   \
@@ -158,7 +158,7 @@
     {                                                                           \
         typedef char const* type;                                               \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         static type                                                             \
         call()                                                                  \
         {                                                                       \
diff --git a/include/boost/fusion/adapted/struct/detail/begin_impl.hpp b/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
index 9cb68719..f67df3a7 100644
--- a/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/begin_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
@@ -57,7 +57,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/adapted/struct/detail/define_struct.hpp b/include/boost/fusion/adapted/struct/detail/define_struct.hpp
index 44d99f06..3b4d1e3f 100644
--- a/include/boost/fusion/adapted/struct/detail/define_struct.hpp
+++ b/include/boost/fusion/adapted/struct/detail/define_struct.hpp
@@ -62,7 +62,7 @@
     ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                       \
                                                                                 \
     template<typename Seq>                                                      \
-    BOOST_FUSION_GPU_ENABLED                                                    \
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                              \
     self_type&                                                                  \
     operator=(Seq const& seq)                                                   \
     {                                                                           \
@@ -121,7 +121,7 @@
         ATTRIBUTE_TUPEL_SIZE,                                                   \
         ATTRIBUTES_SEQ)                                                         \
                                                                                 \
-    BOOST_FUSION_GPU_ENABLED                                                    \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                    \
     NAME()                                                                      \
       : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
             1,                                                                  \
@@ -130,7 +130,7 @@
             ATTRIBUTES_SEQ)                                                     \
     {}                                                                          \
                                                                                 \
-    BOOST_FUSION_GPU_ENABLED                                                    \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                    \
     NAME(self_type const& other_self)                                           \
       : BOOST_PP_SEQ_FOR_EACH_I_R(                                              \
             1,                                                                  \
@@ -140,7 +140,7 @@
     {}                                                                          \
                                                                                 \
     template<typename Seq>                                                      \
-    BOOST_FUSION_GPU_ENABLED                                                    \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                    \
     NAME(Seq const& seq                                                         \
         BOOST_PP_IF(                                                            \
             BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)),                    \
@@ -160,7 +160,7 @@
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR_1(                                      \
         NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                             \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         explicit                                                                \
         NAME(boost::call_traits<                                                \
                 BOOST_PP_TUPLE_ELEM(                                            \
@@ -173,7 +173,7 @@
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1(                                  \
         TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)        \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         explicit                                                                \
         NAME(typename boost::call_traits<                                       \
                 typename boost::fusion::detail::get_first_arg<                  \
@@ -210,7 +210,7 @@
 #define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N(                                  \
     TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)            \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         NAME(BOOST_PP_SEQ_FOR_EACH_I_R(                                         \
                 1,                                                              \
                 BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I,                      \
@@ -238,7 +238,7 @@
 #define BOOST_FUSION_DEFINE_STRUCT_CTOR_N(                                      \
     NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         NAME(BOOST_PP_SEQ_FOR_EACH_I_R(                                         \
                 1,                                                              \
                 BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I,                          \
@@ -280,12 +280,12 @@
     NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE)                                 \
                                                                                 \
         template<typename Seq>                                                  \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         NAME(Seq const&)                                                        \
         {}                                                                      \
                                                                                 \
         template<typename Seq>                                                  \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                          \
         self_type&                                                              \
         operator=(Seq const& seq)                                               \
         {                                                                       \
diff --git a/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp b/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
index d720fcf8..d721feb8 100644
--- a/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
+++ b/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
@@ -66,6 +66,7 @@
 #define BOOST_FUSION_IGNORE_2(ARG1, ARG2)
 
 #define BOOST_FUSION_MAKE_COPY_CONSTRUCTOR(NAME, ATTRIBUTES_SEQ)                \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                    \
     NAME(BOOST_PP_SEQ_FOR_EACH_I(                                               \
             BOOST_FUSION_MAKE_CONST_REF_PARAM,                                  \
             ~,                                                                  \
@@ -113,7 +114,7 @@
     struct deref<SPEC_TYPE, N> >                                                \
     {                                                                           \
         typedef typename boost_fusion_detail_Sq::t##N##_type TYPE_QUAL& type;   \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         static type call(CALL_ARG_TYPE, N> const& iter)                         \
         {                                                                       \
             return iter.seq_.BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE);              \
@@ -163,7 +164,7 @@
             typename boost_fusion_detail_Sq::t##N##_type&                       \
         >::type type;                                                           \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         static type call(boost_fusion_detail_Sq& sq)                            \
         {                                                                       \
             return sq. BOOST_PP_TUPLE_ELEM(2, 1, ATTRIBUTE);                    \
@@ -208,7 +209,7 @@
                 result_raw_type                                                 \
             >::type type;                                                       \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type call(iterator_raw_type const& iter)                     \
             {                                                                   \
                 return boost::fusion::at_c<index>(iter.ref_vec);                \
@@ -336,7 +337,7 @@
         typedef boost::mpl::int_<N> index;                                      \
         typedef boost_fusion_detail_Seq sequence_type;                          \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         BOOST_FUSION_ITERATOR_NAME(NAME)(boost_fusion_detail_Seq& seq)          \
             : seq_(seq)                                                         \
               BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES(              \
@@ -359,7 +360,7 @@
                 boost_fusion_detail_It::index::value + 1                        \
             > type;                                                             \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type call(boost_fusion_detail_It const& it)                  \
             {                                                                   \
                 return type(it.seq_);                                           \
@@ -374,7 +375,7 @@
                 boost_fusion_detail_It::index::value - 1                        \
             > type;                                                             \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type call(boost_fusion_detail_It const& it)                  \
             {                                                                   \
                 return type(it.seq_);                                           \
@@ -392,7 +393,7 @@
                 typename boost_fusion_detail_It1::index                         \
             >::type type;                                                       \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type call(boost_fusion_detail_It1 const& /* it1 */,          \
                              boost_fusion_detail_It2 const& /* it2 */)          \
             {                                                                   \
@@ -412,7 +413,7 @@
                     + boost_fusion_detail_M::value                              \
             > type;                                                             \
                                                                                 \
-            BOOST_FUSION_GPU_ENABLED                                            \
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                            \
             static type call(boost_fusion_detail_It const& it)                  \
             {                                                                   \
                 return type(it.seq_);                                           \
@@ -445,14 +446,14 @@
             (NAME, ATTRIBUTES_SEQ)                                              \
                                                                                 \
     template <typename boost_fusion_detail_Seq>                                 \
-    BOOST_FUSION_GPU_ENABLED                                                    \
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                              \
     NAME(const boost_fusion_detail_Seq& rhs)                                    \
     {                                                                           \
         boost::fusion::copy(rhs, *this);                                        \
     }                                                                           \
                                                                                 \
     template <typename boost_fusion_detail_Seq>                                 \
-    BOOST_FUSION_GPU_ENABLED                                                    \
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                              \
     NAME& operator=(const boost_fusion_detail_Seq& rhs)                         \
     {                                                                           \
         boost::fusion::copy(rhs, *this);                                        \
@@ -465,7 +466,7 @@
         typedef BOOST_FUSION_ITERATOR_NAME(NAME)<boost_fusion_detail_Sq, 0>     \
              type;                                                              \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         static type call(boost_fusion_detail_Sq& sq)                            \
         {                                                                       \
             return type(sq);                                                    \
@@ -480,7 +481,7 @@
             ATTRIBUTES_SEQ_SIZE                                                 \
         > type;                                                                 \
                                                                                 \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         static type call(boost_fusion_detail_Sq& sq)                            \
         {                                                                       \
             return type(sq);                                                    \
diff --git a/include/boost/fusion/adapted/struct/detail/deref_impl.hpp b/include/boost/fusion/adapted/struct/detail/deref_impl.hpp
index a3bc9f3e..c53b51a3 100644
--- a/include/boost/fusion/adapted/struct/detail/deref_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/deref_impl.hpp
@@ -28,9 +28,8 @@ namespace boost { namespace fusion { namespace extension
 
            typedef typename impl::type type;
 
-           BOOST_FUSION_GPU_ENABLED
-           static
-           type
+           BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+           static type
            call(It const& it)
            {
                return impl::call(*it.seq);
diff --git a/include/boost/fusion/adapted/struct/detail/end_impl.hpp b/include/boost/fusion/adapted/struct/detail/end_impl.hpp
index b17eba71..855be7a4 100644
--- a/include/boost/fusion/adapted/struct/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/end_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
@@ -57,7 +57,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
index 350137a4..fcee36ee 100644
--- a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
+++ b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp
@@ -19,7 +19,7 @@
                                                                                 \
     struct NAME                                                                 \
     {                                                                           \
-        BOOST_FUSION_GPU_ENABLED                                                \
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                \
         NAME(WRAPPED_TYPE& in_obj)                                              \
           : obj(in_obj)                                                         \
         {}                                                                      \
diff --git a/include/boost/fusion/algorithm/auxiliary/copy.hpp b/include/boost/fusion/algorithm/auxiliary/copy.hpp
index 683a5c87..ec240bae 100644
--- a/include/boost/fusion/algorithm/auxiliary/copy.hpp
+++ b/include/boost/fusion/algorithm/auxiliary/copy.hpp
@@ -34,14 +34,14 @@ namespace boost { namespace fusion
             typedef typename result_of::end<Seq2>::type end2_type;
 
             template <typename I1, typename I2>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static void
             call(I1 const&, I2 const&, mpl::true_)
             {
             }
 
             template <typename I1, typename I2>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static void
             call(I1 const& src, I2 const& dest, mpl::false_)
             {
@@ -50,7 +50,7 @@ namespace boost { namespace fusion
             }
 
             template <typename I1, typename I2>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static void
             call(I1 const& src, I2 const& dest)
             {
@@ -71,7 +71,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::copy<Seq1 const, Seq2>::type
     copy(Seq1 const& src, Seq2& dest)
     {
diff --git a/include/boost/fusion/algorithm/auxiliary/move.hpp b/include/boost/fusion/algorithm/auxiliary/move.hpp
index e7b9c9ae..e20acae5 100644
--- a/include/boost/fusion/algorithm/auxiliary/move.hpp
+++ b/include/boost/fusion/algorithm/auxiliary/move.hpp
@@ -34,14 +34,14 @@ namespace boost { namespace fusion
             typedef typename result_of::end<Seq2>::type end2_type;
 
             template <typename I1, typename I2>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static void
             call(I1 const&, I2 const&, mpl::true_)
             {
             }
 
             template <typename I1, typename I2>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static void
             call(I1 const& src, I2 const& dest, mpl::false_)
             {
@@ -50,7 +50,7 @@ namespace boost { namespace fusion
             }
 
             template <typename I1, typename I2>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static void
             call(I1 const& src, I2 const& dest)
             {
@@ -71,7 +71,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::move<Seq1, Seq2>::type
     move(Seq1&& src, Seq2& dest)
     {
diff --git a/include/boost/fusion/algorithm/iteration/accumulate.hpp b/include/boost/fusion/algorithm/iteration/accumulate.hpp
index 430f9eb5..fe7112e3 100644
--- a/include/boost/fusion/algorithm/iteration/accumulate.hpp
+++ b/include/boost/fusion/algorithm/iteration/accumulate.hpp
@@ -26,9 +26,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::accumulate<Sequence, State const, F>
@@ -39,9 +38,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::accumulate<Sequence const, State const, F>
diff --git a/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp b/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
index 06333498..50c4d39d 100644
--- a/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
@@ -20,8 +20,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    typename
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::accumulate<Sequence, State const, F>
@@ -29,8 +29,8 @@ namespace boost { namespace fusion
     accumulate(Sequence& seq, State const& state, F f);
 
     template <typename Sequence, typename State, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    typename
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::accumulate<Sequence const, State const, F>
diff --git a/include/boost/fusion/algorithm/iteration/detail/for_each.hpp b/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
index 81b3ab70..0bef5cec 100644
--- a/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
@@ -21,14 +21,14 @@ namespace boost { namespace fusion {
 namespace detail
 {
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void
     for_each_linear(First const&, Last const&, F const&, mpl::true_)
     {
     }
-        
+
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void
     for_each_linear(First const& first, Last const& last, F const& f, mpl::false_)
     {
@@ -39,7 +39,7 @@ namespace detail
 
 
     template <typename Sequence, typename F, typename Tag>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void
     for_each_dispatch(Sequence& seq, F const& f, Tag)
     {
@@ -56,7 +56,7 @@ namespace detail
     struct for_each_unrolled
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static void call(I0 const& i0, F const& f)
         {
             f(*i0);
@@ -77,7 +77,7 @@ namespace detail
     struct for_each_unrolled<3>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static void call(I0 const& i0, F const& f)
         {
             f(*i0);
@@ -94,7 +94,7 @@ namespace detail
     struct for_each_unrolled<2>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static void call(I0 const& i0, F const& f)
         {
             f(*i0);
@@ -108,7 +108,7 @@ namespace detail
     struct for_each_unrolled<1>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static void call(I0 const& i0, F const& f)
         {
             f(*i0);
@@ -119,14 +119,14 @@ namespace detail
     struct for_each_unrolled<0>
     {
         template<typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static void call(It const&, F const&)
         {
         }
     };
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void
     for_each_dispatch(Sequence& seq, F const& f, random_access_traversal_tag)
     {
@@ -136,7 +136,7 @@ namespace detail
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void
     for_each(Sequence& seq, F const& f, mpl::false_) // unsegmented implementation
     {
diff --git a/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
index 58aab114..4ff679af 100644
--- a/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
@@ -16,7 +16,7 @@ namespace boost { namespace fusion { namespace detail
     template <typename Fun>
     struct segmented_fold_fun
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit segmented_fold_fun(Fun const& f)
           : fun(f)
         {}
@@ -29,7 +29,7 @@ namespace boost { namespace fusion { namespace detail
             typedef typename result_of::fold<Sequence, State, Fun>::type type;
             typedef mpl::true_ continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq, State const& state, Context const&, segmented_fold_fun const& fun)
             {
                 return fusion::fold(seq, state, fun.fun);
@@ -52,7 +52,7 @@ namespace boost { namespace fusion { namespace detail
             >::type
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(State& state, Sequence& seq, Fun fun)
         {
             return fusion::segmented_fold_until(seq, state, segmented_fold_fun<Fun>(fun));
diff --git a/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp b/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
index a5d6d4be..a32d9dad 100644
--- a/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
@@ -18,7 +18,7 @@ namespace boost { namespace fusion { namespace detail
     template <typename Fun>
     struct segmented_for_each_fun
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit segmented_for_each_fun(Fun const& f)
           : fun(f)
         {}
@@ -31,7 +31,7 @@ namespace boost { namespace fusion { namespace detail
             typedef void_ type;
             typedef mpl::true_ continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq, State const&, Context const&, segmented_for_each_fun const& fun)
             {
                 fusion::for_each(seq, fun.fun);
@@ -41,7 +41,7 @@ namespace boost { namespace fusion { namespace detail
     };
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void
     for_each(Sequence& seq, F const& f, mpl::true_) // segmented implementation
     {
diff --git a/include/boost/fusion/algorithm/iteration/for_each.hpp b/include/boost/fusion/algorithm/iteration/for_each.hpp
index 836f4810..a523c85e 100644
--- a/include/boost/fusion/algorithm/iteration/for_each.hpp
+++ b/include/boost/fusion/algorithm/iteration/for_each.hpp
@@ -27,9 +27,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , void
@@ -40,9 +39,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , void
diff --git a/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp b/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
index 44a3d1da..13720ead 100644
--- a/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
@@ -20,9 +20,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , void
@@ -30,9 +29,8 @@ namespace boost { namespace fusion
     for_each(Sequence& seq, F const& f);
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , void
diff --git a/include/boost/fusion/algorithm/query/all.hpp b/include/boost/fusion/algorithm/query/all.hpp
index d30d7952..5122af58 100644
--- a/include/boost/fusion/algorithm/query/all.hpp
+++ b/include/boost/fusion/algorithm/query/all.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     all(Sequence const& seq, F f)
     {
diff --git a/include/boost/fusion/algorithm/query/any.hpp b/include/boost/fusion/algorithm/query/any.hpp
index 4ab97148..e1aad08d 100644
--- a/include/boost/fusion/algorithm/query/any.hpp
+++ b/include/boost/fusion/algorithm/query/any.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     any(Sequence const& seq, F f)
     {
diff --git a/include/boost/fusion/algorithm/query/count.hpp b/include/boost/fusion/algorithm/query/count.hpp
index a86bf4fe..61fc0569 100644
--- a/include/boost/fusion/algorithm/query/count.hpp
+++ b/include/boost/fusion/algorithm/query/count.hpp
@@ -26,9 +26,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename T>
-    BOOST_FUSION_GPU_ENABLED
-    inline
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , int
diff --git a/include/boost/fusion/algorithm/query/count_if.hpp b/include/boost/fusion/algorithm/query/count_if.hpp
index ac44ac64..8ef86b01 100644
--- a/include/boost/fusion/algorithm/query/count_if.hpp
+++ b/include/boost/fusion/algorithm/query/count_if.hpp
@@ -26,9 +26,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , int
diff --git a/include/boost/fusion/algorithm/query/detail/all.hpp b/include/boost/fusion/algorithm/query/detail/all.hpp
index 9c7b4c26..e7e1535d 100644
--- a/include/boost/fusion/algorithm/query/detail/all.hpp
+++ b/include/boost/fusion/algorithm/query/detail/all.hpp
@@ -21,7 +21,7 @@
 namespace boost { namespace fusion { namespace detail
 {
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     linear_all(First const&, Last const&, F const&, mpl::true_)
     {
@@ -29,12 +29,12 @@ namespace boost { namespace fusion { namespace detail
     }
 
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     linear_all(First const& first, Last const& last, F& f, mpl::false_)
     {
         typename result_of::deref<First>::type x = *first;
-        return f(x) && 
+        return f(x) &&
             detail::linear_all(
                 fusion::next(first)
               , last
@@ -43,7 +43,7 @@ namespace boost { namespace fusion { namespace detail
     }
 
     template <typename Sequence, typename F, typename Tag>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     all(Sequence const& seq, F f, Tag)
     {
@@ -60,11 +60,11 @@ namespace boost { namespace fusion { namespace detail
     struct unrolled_all
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
-            return 
-                f(*it) && 
+            return
+                f(*it) &&
                 f(*fusion::advance_c<1>(it))&&
                 f(*fusion::advance_c<2>(it)) &&
                 f(*fusion::advance_c<3>(it)) &&
@@ -76,11 +76,11 @@ namespace boost { namespace fusion { namespace detail
     struct unrolled_all<3>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
-            return 
-                f(*it) && 
+            return
+                f(*it) &&
                 f(*fusion::advance_c<1>(it)) &&
                 f(*fusion::advance_c<2>(it));
         }
@@ -90,11 +90,11 @@ namespace boost { namespace fusion { namespace detail
     struct unrolled_all<2>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
-            return 
-                f(*it) && 
+            return
+                f(*it) &&
                 f(*fusion::advance_c<1>(it));
         }
     };
@@ -103,7 +103,7 @@ namespace boost { namespace fusion { namespace detail
     struct unrolled_all<1>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
             return f(*it);
@@ -114,7 +114,7 @@ namespace boost { namespace fusion { namespace detail
     struct unrolled_all<0>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& /*it*/, F /*f*/)
         {
             return true;
@@ -122,7 +122,7 @@ namespace boost { namespace fusion { namespace detail
     };
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     all(Sequence const& seq, F f, random_access_traversal_tag)
     {
diff --git a/include/boost/fusion/algorithm/query/detail/any.hpp b/include/boost/fusion/algorithm/query/detail/any.hpp
index 4e053683..43628eac 100644
--- a/include/boost/fusion/algorithm/query/detail/any.hpp
+++ b/include/boost/fusion/algorithm/query/detail/any.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion {
 namespace detail
 {
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     linear_any(First const&, Last const&, F const&, mpl::true_)
     {
@@ -32,12 +32,12 @@ namespace detail
     }
 
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     linear_any(First const& first, Last const& last, F& f, mpl::false_)
     {
         typename result_of::deref<First>::type x = *first;
-        return f(x) || 
+        return f(x) ||
             detail::linear_any(
                 fusion::next(first)
               , last
@@ -46,7 +46,7 @@ namespace detail
     }
 
     template <typename Sequence, typename F, typename Tag>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     any(Sequence const& seq, F f, Tag)
     {
@@ -63,11 +63,11 @@ namespace detail
     struct unrolled_any
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
-            return 
-                f(*it) || 
+            return
+                f(*it) ||
                 f(*fusion::advance_c<1>(it))||
                 f(*fusion::advance_c<2>(it)) ||
                 f(*fusion::advance_c<3>(it)) ||
@@ -79,11 +79,11 @@ namespace detail
     struct unrolled_any<3>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
-            return 
-                f(*it) || 
+            return
+                f(*it) ||
                 f(*fusion::advance_c<1>(it)) ||
                 f(*fusion::advance_c<2>(it));
         }
@@ -93,11 +93,11 @@ namespace detail
     struct unrolled_any<2>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
-            return 
-                f(*it) || 
+            return
+                f(*it) ||
                 f(*fusion::advance_c<1>(it));
         }
     };
@@ -106,7 +106,7 @@ namespace detail
     struct unrolled_any<1>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const& it, F f)
         {
             return f(*it);
@@ -117,7 +117,7 @@ namespace detail
     struct unrolled_any<0>
     {
         template <typename It, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool call(It const&, F)
         {
             return false;
@@ -125,7 +125,7 @@ namespace detail
     };
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     any(Sequence const& seq, F f, random_access_traversal_tag)
     {
diff --git a/include/boost/fusion/algorithm/query/detail/count.hpp b/include/boost/fusion/algorithm/query/detail/count.hpp
index 5e046f6b..86714ff7 100644
--- a/include/boost/fusion/algorithm/query/detail/count.hpp
+++ b/include/boost/fusion/algorithm/query/detail/count.hpp
@@ -25,10 +25,10 @@ namespace boost { namespace fusion { namespace detail
 
     // T1 is convertible to T2 or vice versa
     template <>
-    struct compare_convertible<true> 
+    struct compare_convertible<true>
     {
         template <typename T1, typename T2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(T1 const& x, T2 const& y)
         {
@@ -41,7 +41,7 @@ namespace boost { namespace fusion { namespace detail
     struct compare_convertible<false>
     {
         template <typename T1, typename T2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(T1 const&, T2 const&)
         {
@@ -53,16 +53,16 @@ namespace boost { namespace fusion { namespace detail
     struct count_compare
     {
         typedef typename detail::call_param<T1>::type param;
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         count_compare(param in_x)
             : x(in_x) {}
 
         template <typename T2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         bool
-        operator()(T2 const& y)
+        operator()(T2 const& y) const
         {
-            return 
+            return
                 compare_convertible<
                     mpl::or_<
                         is_convertible<T1, T2>
diff --git a/include/boost/fusion/algorithm/query/detail/count_if.hpp b/include/boost/fusion/algorithm/query/detail/count_if.hpp
index baf9fe9f..17c67a0b 100644
--- a/include/boost/fusion/algorithm/query/detail/count_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/count_if.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion {
 namespace detail
 {
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline int
     linear_count_if(First const&, Last const&, F const&, mpl::true_)
     {
@@ -32,11 +32,11 @@ namespace detail
     }
 
     template <typename First, typename Last, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline int
     linear_count_if(First const& first, Last const& last, F& f, mpl::false_)
     {
-        int n =  
+        int n =
             detail::linear_count_if(
                 fusion::next(first)
               , last
@@ -48,7 +48,7 @@ namespace detail
     }
 
     template <typename Sequence, typename F, typename Tag>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline int
     count_if(Sequence const& seq, F f, Tag)
     {
@@ -65,7 +65,7 @@ namespace detail
     struct unrolled_count_if
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static int call(I0 const& i0, F f)
         {
             int ct = unrolled_count_if<n-4>::
@@ -96,7 +96,7 @@ namespace detail
     struct unrolled_count_if<3>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static int call(I0 const& i0, F f)
         {
             int ct = 0;
@@ -121,7 +121,7 @@ namespace detail
     struct unrolled_count_if<2>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static int call(I0 const& i0, F f)
         {
             int ct = 0;
@@ -142,7 +142,7 @@ namespace detail
     struct unrolled_count_if<1>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static int call(I0 const& i0, F f)
         {
             int ct = 0;
@@ -157,7 +157,7 @@ namespace detail
     struct unrolled_count_if<0>
     {
         template<typename I0, typename F>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static int call(I0 const&, F)
         {
             return 0;
@@ -165,7 +165,7 @@ namespace detail
     };
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline int
     count_if(Sequence const& seq, F f, random_access_traversal_tag)
     {
diff --git a/include/boost/fusion/algorithm/query/detail/find_if.hpp b/include/boost/fusion/algorithm/query/detail/find_if.hpp
index 41baab48..b200794a 100644
--- a/include/boost/fusion/algorithm/query/detail/find_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/find_if.hpp
@@ -184,7 +184,7 @@ namespace detail
         type;
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         recursive_call(Iterator const& iter, mpl::true_)
         {
@@ -192,7 +192,7 @@ namespace detail
         }
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         recursive_call(Iterator const& iter, mpl::false_)
         {
@@ -200,7 +200,7 @@ namespace detail
         }
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         recursive_call(Iterator const& iter)
         {
@@ -209,7 +209,7 @@ namespace detail
         }
 
         template <typename Iterator, typename Tag>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         choose_call(Iterator const& iter, Tag)
         {
@@ -217,7 +217,7 @@ namespace detail
         }
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         choose_call(Iterator const& iter, random_access_traversal_tag)
         {
@@ -226,7 +226,7 @@ namespace detail
         }
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         iter_call(Iterator const& iter)
         {
@@ -234,7 +234,7 @@ namespace detail
         }
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(Sequence& seq)
         {
diff --git a/include/boost/fusion/algorithm/query/detail/segmented_find.hpp b/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
index 21c13a46..d8533afe 100644
--- a/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
+++ b/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
@@ -45,19 +45,19 @@ namespace boost { namespace fusion { namespace detail
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq, State const&state, Context const& context, segmented_find_fun)
             {
                 return call_impl(seq, state, context, continue_type());
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call_impl(Sequence&, State const&state, Context const&, mpl::true_)
             {
                 return state;
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call_impl(Sequence& seq, State const&, Context const& context, mpl::false_)
             {
                 return fusion::make_segmented_iterator(fusion::find<T>(seq), context);
@@ -78,7 +78,7 @@ namespace boost { namespace fusion { namespace detail
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq)
             {
                 return fusion::segmented_fold_until(
diff --git a/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp b/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
index 798ed085..fd527c73 100644
--- a/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
@@ -45,19 +45,19 @@ namespace boost { namespace fusion { namespace detail
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq, State const&state, Context const& context, segmented_find_if_fun)
             {
                 return call_impl(seq, state, context, continue_type());
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call_impl(Sequence&, State const&state, Context const&, mpl::true_)
             {
                 return state;
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call_impl(Sequence& seq, State const&, Context const& context, mpl::false_)
             {
                 return fusion::make_segmented_iterator(fusion::find_if<Pred>(seq), context);
@@ -78,7 +78,7 @@ namespace boost { namespace fusion { namespace detail
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq)
             {
                 return fusion::segmented_fold_until(
diff --git a/include/boost/fusion/algorithm/query/find.hpp b/include/boost/fusion/algorithm/query/find.hpp
index 56e53c39..41c22fb3 100644
--- a/include/boost/fusion/algorithm/query/find.hpp
+++ b/include/boost/fusion/algorithm/query/find.hpp
@@ -47,8 +47,8 @@ namespace boost { namespace fusion
     }
 
     template <typename T, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
-    inline typename 
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_disable_if<
             is_const<Sequence>
           , result_of::find<Sequence, T>
@@ -60,7 +60,7 @@ namespace boost { namespace fusion
     }
 
     template <typename T, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::find<Sequence const, T>::type const
     find(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/query/find_fwd.hpp b/include/boost/fusion/algorithm/query/find_fwd.hpp
index a43b5eac..c4fc0a9f 100644
--- a/include/boost/fusion/algorithm/query/find_fwd.hpp
+++ b/include/boost/fusion/algorithm/query/find_fwd.hpp
@@ -20,8 +20,8 @@ namespace boost { namespace fusion
     }
 
     template <typename T, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
-    inline typename 
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_disable_if<
             is_const<Sequence>
           , result_of::find<Sequence, T>
@@ -29,7 +29,7 @@ namespace boost { namespace fusion
     find(Sequence& seq);
 
     template <typename T, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::find<Sequence const, T>::type const
     find(Sequence const& seq);
 }}
diff --git a/include/boost/fusion/algorithm/query/find_if.hpp b/include/boost/fusion/algorithm/query/find_if.hpp
index c9e50162..38601ebf 100644
--- a/include/boost/fusion/algorithm/query/find_if.hpp
+++ b/include/boost/fusion/algorithm/query/find_if.hpp
@@ -42,8 +42,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Pred, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
-    inline typename 
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_disable_if<
             is_const<Sequence>
           , result_of::find_if<Sequence, Pred>
@@ -55,7 +55,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Pred, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::find_if<Sequence const, Pred>::type const
     find_if(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/query/find_if_fwd.hpp b/include/boost/fusion/algorithm/query/find_if_fwd.hpp
index cbe9e5e9..5c8abd5b 100644
--- a/include/boost/fusion/algorithm/query/find_if_fwd.hpp
+++ b/include/boost/fusion/algorithm/query/find_if_fwd.hpp
@@ -21,7 +21,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Pred, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename
         lazy_disable_if<
             is_const<Sequence>
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
     find_if(Sequence& seq);
 
     template <typename Pred, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::find_if<Sequence const, Pred>::type const
     find_if(Sequence const& seq);
 }}
diff --git a/include/boost/fusion/algorithm/query/none.hpp b/include/boost/fusion/algorithm/query/none.hpp
index bb554e3b..1fecdbfe 100644
--- a/include/boost/fusion/algorithm/query/none.hpp
+++ b/include/boost/fusion/algorithm/query/none.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     none(Sequence const& seq, F f)
     {
diff --git a/include/boost/fusion/algorithm/transformation/clear.hpp b/include/boost/fusion/algorithm/transformation/clear.hpp
index de643408..d2e42fe0 100644
--- a/include/boost/fusion/algorithm/transformation/clear.hpp
+++ b/include/boost/fusion/algorithm/transformation/clear.hpp
@@ -22,7 +22,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::clear<Sequence const>::type
     clear(Sequence const& /*seq*/)
     {
diff --git a/include/boost/fusion/algorithm/transformation/detail/replace.hpp b/include/boost/fusion/algorithm/transformation/detail/replace.hpp
index 5a7516ba..88c4faab 100644
--- a/include/boost/fusion/algorithm/transformation/detail/replace.hpp
+++ b/include/boost/fusion/algorithm/transformation/detail/replace.hpp
@@ -21,7 +21,7 @@ namespace boost { namespace fusion { namespace detail
     struct replacer_helper<false>
     {
         template <typename U, typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static U&
         call(U& x, T const&, T const&)
         {
@@ -33,7 +33,7 @@ namespace boost { namespace fusion { namespace detail
     struct replacer_helper<true>
     {
         template <typename U, typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static U
         call(U& x, T const& old_value, T const& new_value)
         {
@@ -44,7 +44,7 @@ namespace boost { namespace fusion { namespace detail
     template <typename T>
     struct replacer
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         replacer(T const& in_old_value, T const& in_new_value)
             : old_value(in_old_value), new_value(in_new_value) {}
 
@@ -59,9 +59,9 @@ namespace boost { namespace fusion { namespace detail
                 mpl::if_<is_convertible<T, value>, value, value const&>::type
             type;
         };
-    
+
         template <typename U>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename result<replacer(U)>::type
         operator()(U const& x) const
         {
diff --git a/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp b/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
index 5b9663b1..2ecff682 100644
--- a/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
@@ -21,7 +21,7 @@ namespace boost { namespace fusion { namespace detail
     struct replacer_if_helper<false>
     {
         template <typename U, typename F, typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static U&
         call(U& x, F&, T const&)
         {
@@ -33,7 +33,7 @@ namespace boost { namespace fusion { namespace detail
     struct replacer_if_helper<true>
     {
         template <typename U, typename F, typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static U
         call(U& x, F& f, T const& new_value)
         {
@@ -44,7 +44,7 @@ namespace boost { namespace fusion { namespace detail
     template <typename F, typename T>
     struct replacer_if
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         replacer_if(F in_f, T const& in_new_value)
             : f(in_f), new_value(in_new_value) {}
 
@@ -59,9 +59,9 @@ namespace boost { namespace fusion { namespace detail
                 mpl::if_<is_convertible<T, value>, value, value const&>::type
             type;
         };
-    
+
         template <typename U>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename result<replacer_if(U)>::type
         operator()(U const& x) const
         {
diff --git a/include/boost/fusion/algorithm/transformation/erase.hpp b/include/boost/fusion/algorithm/transformation/erase.hpp
index 2d220947..0f3b8a15 100644
--- a/include/boost/fusion/algorithm/transformation/erase.hpp
+++ b/include/boost/fusion/algorithm/transformation/erase.hpp
@@ -38,21 +38,21 @@ namespace boost { namespace fusion
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(First const& first, mpl::false_)
             {
                 return fusion::next(convert_iterator<First>::call(first));
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(First const& first, mpl::true_)
             {
                 return convert_iterator<First>::call(first);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(First const& first)
             {
@@ -61,7 +61,7 @@ namespace boost { namespace fusion
         };
 
         struct use_default;
-        
+
         template <class T, class Default>
         struct fusion_default_help
           : mpl::if_<
@@ -71,7 +71,7 @@ namespace boost { namespace fusion
             >
         {
         };
-        
+
         template <
             typename Sequence
           , typename First
@@ -89,7 +89,7 @@ namespace boost { namespace fusion
                   , typename compute_erase_last<Sequence, First>::type
                 >::type
             LastType;
-            
+
             typedef typename convert_iterator<FirstType>::type first_type;
             typedef typename convert_iterator<LastType>::type last_type;
             typedef iterator_range<seq_first_type, first_type> left_type;
@@ -99,7 +99,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename First>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
@@ -122,7 +122,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename First, typename Last>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::erase<Sequence const, First, Last>::type
     erase(Sequence const& seq, First const& first, Last const& last)
     {
diff --git a/include/boost/fusion/algorithm/transformation/erase_key.hpp b/include/boost/fusion/algorithm/transformation/erase_key.hpp
index 43340047..3757f46f 100644
--- a/include/boost/fusion/algorithm/transformation/erase_key.hpp
+++ b/include/boost/fusion/algorithm/transformation/erase_key.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Key, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::erase_key<Sequence const, Key>::type
     erase_key(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/filter.hpp b/include/boost/fusion/algorithm/transformation/filter.hpp
index 2e290e29..2fc62720 100644
--- a/include/boost/fusion/algorithm/transformation/filter.hpp
+++ b/include/boost/fusion/algorithm/transformation/filter.hpp
@@ -22,9 +22,9 @@ namespace boost { namespace fusion
             typedef filter_view<Sequence, is_same<mpl::_, T> > type;
         };
     }
-    
+
     template <typename T, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::filter<Sequence const, T>::type
     filter(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/filter_if.hpp b/include/boost/fusion/algorithm/transformation/filter_if.hpp
index 1b9f0d32..ca28e0e8 100644
--- a/include/boost/fusion/algorithm/transformation/filter_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/filter_if.hpp
@@ -20,9 +20,9 @@ namespace boost { namespace fusion
             typedef filter_view<Sequence, Pred> type;
         };
     }
-    
+
     template <typename Pred, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::filter_if<Sequence const, Pred>::type
     filter_if(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/flatten.hpp b/include/boost/fusion/algorithm/transformation/flatten.hpp
index 9cd81fa9..e3cfa983 100644
--- a/include/boost/fusion/algorithm/transformation/flatten.hpp
+++ b/include/boost/fusion/algorithm/transformation/flatten.hpp
@@ -25,13 +25,15 @@ namespace boost { namespace fusion { namespace result_of
 namespace boost { namespace fusion
 {
     template <typename Sequence>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::flatten<Sequence>::type
     flatten(Sequence& view)
     {
         return flatten_view<Sequence>(view);
     }
-    
+
     template <typename Sequence>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::flatten<Sequence const>::type
     flatten(Sequence const& view)
     {
diff --git a/include/boost/fusion/algorithm/transformation/insert.hpp b/include/boost/fusion/algorithm/transformation/insert.hpp
index 78590222..44e59653 100644
--- a/include/boost/fusion/algorithm/transformation/insert.hpp
+++ b/include/boost/fusion/algorithm/transformation/insert.hpp
@@ -41,9 +41,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename Position, typename T>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::insert<Sequence const, Position, T>
diff --git a/include/boost/fusion/algorithm/transformation/insert_range.hpp b/include/boost/fusion/algorithm/transformation/insert_range.hpp
index 660ed17f..40e64e1f 100644
--- a/include/boost/fusion/algorithm/transformation/insert_range.hpp
+++ b/include/boost/fusion/algorithm/transformation/insert_range.hpp
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename Position, typename Range>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::insert_range<Sequence const, Position, Range const>::type
     insert_range(Sequence const& seq, Position const& pos, Range const& range)
     {
diff --git a/include/boost/fusion/algorithm/transformation/join.hpp b/include/boost/fusion/algorithm/transformation/join.hpp
index 51af0535..8be49224 100644
--- a/include/boost/fusion/algorithm/transformation/join.hpp
+++ b/include/boost/fusion/algorithm/transformation/join.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion {
     }
 
     template<typename LhSequence, typename RhSequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::join<LhSequence const, RhSequence const>::type
     join(LhSequence const& lhs, RhSequence const& rhs)
     {
diff --git a/include/boost/fusion/algorithm/transformation/pop_back.hpp b/include/boost/fusion/algorithm/transformation/pop_back.hpp
index b20b5003..2f55fa5e 100644
--- a/include/boost/fusion/algorithm/transformation/pop_back.hpp
+++ b/include/boost/fusion/algorithm/transformation/pop_back.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
 
         static bool const is_last = IsLast;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pop_back_iterator(Iterator_ const& iterator_base)
             : base_type(iterator_base) {}
 
@@ -42,7 +42,7 @@ namespace boost { namespace fusion
         {
             typedef pop_back_iterator<BaseIterator, is_last> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(BaseIterator const& i)
             {
@@ -94,7 +94,7 @@ namespace boost { namespace fusion
 
             typedef pop_back_iterator<base_prior, false> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& i)
             {
@@ -116,7 +116,7 @@ namespace boost { namespace fusion
 
             typedef pop_back_iterator<base_prior, false> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& i)
             {
@@ -152,7 +152,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::pop_back<Sequence const>::type
     pop_back(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/pop_front.hpp b/include/boost/fusion/algorithm/transformation/pop_front.hpp
index 636ab12c..11b7f6ee 100644
--- a/include/boost/fusion/algorithm/transformation/pop_front.hpp
+++ b/include/boost/fusion/algorithm/transformation/pop_front.hpp
@@ -20,19 +20,19 @@ namespace boost { namespace fusion
         template <typename Sequence>
         struct pop_front
         {
-            typedef 
+            typedef
                 iterator_range<
                     typename next<
                         typename begin<Sequence>::type
                     >::type
                   , typename end<Sequence>::type
-                > 
+                >
             type;
         };
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::pop_front<Sequence const>::type
     pop_front(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/push_back.hpp b/include/boost/fusion/algorithm/transformation/push_back.hpp
index 484425d8..51c2569d 100644
--- a/include/boost/fusion/algorithm/transformation/push_back.hpp
+++ b/include/boost/fusion/algorithm/transformation/push_back.hpp
@@ -27,9 +27,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename T>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::push_back<Sequence const, T>
diff --git a/include/boost/fusion/algorithm/transformation/push_front.hpp b/include/boost/fusion/algorithm/transformation/push_front.hpp
index bda056b1..a1b7b390 100644
--- a/include/boost/fusion/algorithm/transformation/push_front.hpp
+++ b/include/boost/fusion/algorithm/transformation/push_front.hpp
@@ -27,9 +27,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename T>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
           , result_of::push_front<Sequence const, T>
diff --git a/include/boost/fusion/algorithm/transformation/remove.hpp b/include/boost/fusion/algorithm/transformation/remove.hpp
index 18dfd1d6..f8bebf70 100644
--- a/include/boost/fusion/algorithm/transformation/remove.hpp
+++ b/include/boost/fusion/algorithm/transformation/remove.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion
     }
 
     template <typename T, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::remove<Sequence const, T>::type
     remove(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/remove_if.hpp b/include/boost/fusion/algorithm/transformation/remove_if.hpp
index 40248839..5497e3a3 100644
--- a/include/boost/fusion/algorithm/transformation/remove_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/remove_if.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Pred, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::remove_if<Sequence const, Pred>::type
     remove_if(Sequence const& seq)
     {
diff --git a/include/boost/fusion/algorithm/transformation/replace.hpp b/include/boost/fusion/algorithm/transformation/replace.hpp
index a0a9885b..4d754cc0 100644
--- a/include/boost/fusion/algorithm/transformation/replace.hpp
+++ b/include/boost/fusion/algorithm/transformation/replace.hpp
@@ -25,9 +25,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename T>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , typename result_of::replace<Sequence const, T>::type
diff --git a/include/boost/fusion/algorithm/transformation/replace_if.hpp b/include/boost/fusion/algorithm/transformation/replace_if.hpp
index da3557aa..8a2bddc6 100644
--- a/include/boost/fusion/algorithm/transformation/replace_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/replace_if.hpp
@@ -26,9 +26,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F, typename T>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename 
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , typename result_of::replace_if<Sequence const, F, T>::type
diff --git a/include/boost/fusion/algorithm/transformation/reverse.hpp b/include/boost/fusion/algorithm/transformation/reverse.hpp
index 384224d9..53de417a 100644
--- a/include/boost/fusion/algorithm/transformation/reverse.hpp
+++ b/include/boost/fusion/algorithm/transformation/reverse.hpp
@@ -24,9 +24,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
-    inline 
-    typename
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename
         enable_if<
             traits::is_sequence<Sequence>
           , reverse_view<Sequence const>
diff --git a/include/boost/fusion/algorithm/transformation/transform.hpp b/include/boost/fusion/algorithm/transformation/transform.hpp
index 94e45460..6a487ccc 100644
--- a/include/boost/fusion/algorithm/transformation/transform.hpp
+++ b/include/boost/fusion/algorithm/transformation/transform.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::transform<Sequence const, F>::type
     transform(Sequence const& seq, F f)
     {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence1, typename Sequence2, typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::transform<Sequence1 const, Sequence2 const, F>::type
     transform(Sequence1 const& seq1, Sequence2 const& seq2, F f)
     {
diff --git a/include/boost/fusion/algorithm/transformation/zip.hpp b/include/boost/fusion/algorithm/transformation/zip.hpp
index 796ec9e3..e94efc81 100644
--- a/include/boost/fusion/algorithm/transformation/zip.hpp
+++ b/include/boost/fusion/algorithm/transformation/zip.hpp
@@ -101,7 +101,7 @@ namespace boost { namespace fusion
 #define FUSION_REF_PARAM(z, n, data) const T ## n&
 
     template<BOOST_PP_ENUM_PARAMS(ZIP_ITERATION, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::zip<BOOST_PP_ENUM_PARAMS(ZIP_ITERATION, const T)>::type
     zip(BOOST_PP_ENUM_BINARY_PARAMS(ZIP_ITERATION, T, const& t))
     {
diff --git a/include/boost/fusion/container/deque/back_extended_deque.hpp b/include/boost/fusion/container/deque/back_extended_deque.hpp
index 206b9285..04b1d41f 100644
--- a/include/boost/fusion/container/deque/back_extended_deque.hpp
+++ b/include/boost/fusion/container/deque/back_extended_deque.hpp
@@ -8,6 +8,7 @@
 #if !defined(BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209)
 #define BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209
 
+#include <boost/config.hpp>
 #include <boost/fusion/support/config.hpp>
 #include <boost/mpl/int.hpp>
 
@@ -28,20 +29,20 @@ namespace boost { namespace fusion
         typedef mpl::int_<(result_of::size<Deque>::value + 1)> size;
 
         template <typename Arg>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         back_extended_deque(Deque const& deque, Arg const& val)
           : base(val, deque)
         {}
 
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         template <typename Arg>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         back_extended_deque(Deque const& deque, Arg& val)
           : base(val, deque)
         {}
 #else
         template <typename Arg>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         back_extended_deque(Deque const& deque, Arg&& val)
           : base(BOOST_FUSION_FWD_ELEM(Arg, val), deque)
         {}
diff --git a/include/boost/fusion/container/deque/convert.hpp b/include/boost/fusion/container/deque/convert.hpp
index f791519d..9a4bf01a 100644
--- a/include/boost/fusion/container/deque/convert.hpp
+++ b/include/boost/fusion/container/deque/convert.hpp
@@ -39,7 +39,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_deque<Sequence>::type
     as_deque(Sequence& seq)
     {
@@ -48,7 +48,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_deque<Sequence const>::type
     as_deque(Sequence const& seq)
     {
diff --git a/include/boost/fusion/container/deque/deque.hpp b/include/boost/fusion/container/deque/deque.hpp
index ffb1277e..96919052 100644
--- a/include/boost/fusion/container/deque/deque.hpp
+++ b/include/boost/fusion/container/deque/deque.hpp
@@ -54,16 +54,16 @@ namespace boost { namespace fusion
         typedef mpl::false_ is_view;
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(Sequence const&,
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence>>>::type* /*dummy*/ = 0)
+                  , result_of::empty<Sequence>>>::type* /*dummy*/ = 0) BOOST_NOEXCEPT
         {}
 
-        BOOST_FUSION_GPU_ENABLED
-        deque() {}
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque() BOOST_NOEXCEPT {}
     };
 
     template <typename Head, typename ...Tail>
@@ -79,14 +79,14 @@ namespace boost { namespace fusion
         typedef mpl::int_<-1> next_down;
         typedef mpl::false_ is_view;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque()
         {}
 
         template <typename Head_, typename ...Tail_, typename =
             typename enable_if<is_convertible<Head_, Head> >::type
         >
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque<Head_, Tail_...> const& seq)
           : base(seq)
         {}
@@ -94,7 +94,7 @@ namespace boost { namespace fusion
         template <typename Head_, typename ...Tail_, typename =
             typename enable_if<is_convertible<Head_, Head> >::type
         >
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque<Head_, Tail_...>& seq)
           : base(seq)
         {}
@@ -103,25 +103,25 @@ namespace boost { namespace fusion
         template <typename Head_, typename ...Tail_, typename =
             typename enable_if<is_convertible<Head_, Head> >::type
         >
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque<Head_, Tail_...>&& seq)
           : base(std::forward<deque<Head_, Tail_...>>(seq))
         {}
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque const& seq)
           : base(seq)
         {}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque&& seq)
           : base(std::forward<deque>(seq))
         {}
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(typename detail::call_param<Head>::type head
                      , typename detail::call_param<Tail>::type... tail)
           : base(detail::deque_keyed_values<Head, Tail...>::construct(head, tail...))
@@ -131,7 +131,7 @@ namespace boost { namespace fusion
         template <typename Head_, typename ...Tail_, typename =
             typename enable_if<is_convertible<Head_, Head> >::type
         >
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(Head_&& head, Tail_&&... tail)
           : base(detail::deque_keyed_values<Head, Tail...>
                 ::forward_(BOOST_FUSION_FWD_ELEM(Head_, head), BOOST_FUSION_FWD_ELEM(Tail_, tail)...))
@@ -140,21 +140,21 @@ namespace boost { namespace fusion
         template <typename Head_, typename ...Tail_, typename =
             typename enable_if<is_convertible<Head_, Head> >::type
         >
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(Head_ const& head, Tail_ const&... tail)
           : base(detail::deque_keyed_values<Head_, Tail_...>::construct(head, tail...))
         {}
 #endif
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(Sequence const& seq
           , typename disable_if<is_convertible<Sequence, Head> >::type* /*dummy*/ = 0)
           : base(base::from_iterator(fusion::begin(seq)))
         {}
 
         template <typename ...Elements>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque& operator=(deque<Elements...> const& rhs)
         {
             base::operator=(rhs);
@@ -162,7 +162,7 @@ namespace boost { namespace fusion
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque& operator=(T const& rhs)
         {
             base::operator=(rhs);
@@ -171,7 +171,7 @@ namespace boost { namespace fusion
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque& operator=(T&& rhs)
         {
             base::operator=(BOOST_FUSION_FWD_ELEM(T, rhs));
diff --git a/include/boost/fusion/container/deque/deque_iterator.hpp b/include/boost/fusion/container/deque/deque_iterator.hpp
index f603b545..e9a79de2 100644
--- a/include/boost/fusion/container/deque/deque_iterator.hpp
+++ b/include/boost/fusion/container/deque/deque_iterator.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion {
         typedef Seq sequence;
         typedef mpl::int_<Pos> index;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque_iterator(Seq& seq)
             : seq_(seq)
         {}
@@ -54,7 +54,7 @@ namespace boost { namespace fusion {
                 add_const<element_type>,
                 mpl::identity<element_type> >::type>::type type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& it)
             {
@@ -69,7 +69,7 @@ namespace boost { namespace fusion {
             typedef typename Iterator::sequence sequence;
             typedef deque_iterator<sequence, index::value + N::value> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& i)
             {
@@ -96,7 +96,7 @@ namespace boost { namespace fusion {
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(I1 const&, I2 const&)
             {
diff --git a/include/boost/fusion/container/deque/detail/at_impl.hpp b/include/boost/fusion/container/deque/detail/at_impl.hpp
index 4c5ffa94..3edf4829 100644
--- a/include/boost/fusion/container/deque/detail/at_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/at_impl.hpp
@@ -54,7 +54,7 @@ namespace boost { namespace fusion
                     >::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return seq.get(adjusted_index());
diff --git a/include/boost/fusion/container/deque/detail/begin_impl.hpp b/include/boost/fusion/container/deque/detail/begin_impl.hpp
index c4eed54f..27b4f41b 100644
--- a/include/boost/fusion/container/deque/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/begin_impl.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
                     deque_iterator<Sequence, (Sequence::next_down::value + 1)>
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return type(seq);
diff --git a/include/boost/fusion/container/deque/detail/build_deque.hpp b/include/boost/fusion/container/deque/detail/build_deque.hpp
index d555c6c6..4dd990ae 100644
--- a/include/boost/fusion/container/deque/detail/build_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/build_deque.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace fusion { namespace detail
     struct build_deque<First, Last, true>
     {
         typedef deque<> type;
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const&, Last const&)
         {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef deque<T, Rest...> type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(T const& first, deque<Rest...> const& rest)
         {
@@ -64,7 +64,7 @@ namespace boost { namespace fusion { namespace detail
 
         typedef typename push_front::type type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const& f, Last const& l)
         {
diff --git a/include/boost/fusion/container/deque/detail/convert_impl.hpp b/include/boost/fusion/container/deque/detail/convert_impl.hpp
index f8ff5429..ba9b8477 100644
--- a/include/boost/fusion/container/deque/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/convert_impl.hpp
@@ -37,7 +37,8 @@ namespace boost { namespace fusion
             {
                 typedef result_of::as_deque<Sequence> gen;
                 typedef typename gen::type type;
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return gen::call(seq);
diff --git a/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
index 173a4924..e95daf3a 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
@@ -38,7 +38,7 @@ BOOST_FUSION_BARRIER_BEGIN
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator)
         {
@@ -124,7 +124,7 @@ BOOST_FUSION_BARRIER_END
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator const& i0)
         {
diff --git a/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
index 74d37faa..99cbe584 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_deque<Sequence>::type
     as_deque(Sequence& seq)
     {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_deque<Sequence const>::type
     as_deque(Sequence const& seq)
     {
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
index 1b92ceaf..b5bacbcf 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
@@ -79,34 +79,34 @@ namespace boost { namespace fusion {
 
 #include <boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp>
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque()
             {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(typename detail::call_param<T0>::type t0)
             : base(t0, detail::nil_keyed_element())
             {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(deque const& rhs)
             : base(rhs)
             {}
 
         template<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)> const& seq)
             : base(seq)
             {}
 
         template<typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(Sequence const& seq, typename disable_if<is_convertible<Sequence, T0> >::type* /*dummy*/ = 0)
             : base(base::from_iterator(fusion::begin(seq)))
             {}
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
         operator=(deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)> const& rhs)
         {
@@ -115,7 +115,7 @@ namespace boost { namespace fusion {
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
         operator=(T const& rhs)
         {
@@ -129,23 +129,23 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
         template <typename T0_>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(T0_&& t0
           , typename enable_if<is_convertible<T0_, T0> >::type* /*dummy*/ = 0
          )
             : base(BOOST_FUSION_FWD_ELEM(T0_, t0), detail::nil_keyed_element())
             {}
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit deque(deque&& rhs)
             : base(std::forward<deque>(rhs))
             {}
         template<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>&& seq)
             : base(std::forward<deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>>(seq))
             {}
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque&
         operator=(T&& rhs)
         {
@@ -170,16 +170,16 @@ FUSION_HASH endif
         typedef mpl::false_ is_view;
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         deque(Sequence const&,
             typename enable_if<
                 mpl::and_<
                     traits::is_sequence<Sequence>
-                  , result_of::empty<Sequence> > >::type* /*dummy*/ = 0)
+                  , result_of::empty<Sequence> > >::type* /*dummy*/ = 0) BOOST_NOEXCEPT
         {}
 
-        BOOST_FUSION_GPU_ENABLED
-        deque() {}
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        deque() BOOST_NOEXCEPT {}
     };
 
 }}
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
index 277811ec..eeaa29ff 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
@@ -35,7 +35,7 @@ FUSION_HASH if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #endif
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-BOOST_FUSION_GPU_ENABLED
+BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
 deque(BOOST_PP_ENUM_BINARY_PARAMS(N, typename detail::call_param<T, >::type t))
     : base(detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(N, T)>::construct(BOOST_PP_ENUM_PARAMS(N, t)))
 {}
@@ -49,13 +49,13 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #endif
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-BOOST_FUSION_GPU_ENABLED
+BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
 deque(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& t))
     : base(detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(N, T)>::construct(BOOST_PP_ENUM_PARAMS(N, t)))
 {}
 
 template <BOOST_PP_ENUM_PARAMS(N, typename T_)>
-BOOST_FUSION_GPU_ENABLED
+BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
 deque(BOOST_PP_ENUM_BINARY_PARAMS(N, T_, && t))
     : base(detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(N, T)>::
       forward_(BOOST_PP_ENUM(N, FUSION_DEQUE_FORWARD_CTOR_FORWARD, _)))
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
index 1ee91ba2..21b49345 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
@@ -68,13 +68,13 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef nil_keyed_element type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type construct()
         {
             return type();
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type forward_()
         {
             return type();
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
index 8ba7eba0..87f3714b 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
@@ -34,7 +34,7 @@
 
 #define N BOOST_PP_ITERATION()
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type construct(BOOST_PP_ENUM_BINARY_PARAMS(N, typename detail::call_param<T, >::type t))
         {
             return type(t0,
@@ -52,7 +52,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
         template <BOOST_PP_ENUM_PARAMS(N, typename T_)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type forward_(BOOST_PP_ENUM_BINARY_PARAMS(N, T_, && t))
         {
             return type(BOOST_FUSION_FWD_ELEM(T_0, t0),
diff --git a/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp b/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
index efb2b90d..7c6df7b6 100644
--- a/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
+++ b/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
@@ -28,7 +28,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename deque_keyed_values_impl<next_index, Tail...>::type tail;
         typedef keyed_element<N, Head, tail> type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type construct(
           typename detail::call_param<Head>::type head
         , typename detail::call_param<Tail>::type... tail)
@@ -40,7 +40,7 @@ namespace boost { namespace fusion { namespace detail
         }
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         template <typename Head_, typename ...Tail_>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type forward_(Head_&& head, Tail_&&... tail)
         {
             return type(
@@ -59,11 +59,11 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef nil_keyed_element type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type construct() { return type(); }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type forward_() { return type(); }
 #endif
     };
diff --git a/include/boost/fusion/container/deque/detail/end_impl.hpp b/include/boost/fusion/container/deque/detail/end_impl.hpp
index 4ea344a9..8f67ff4a 100644
--- a/include/boost/fusion/container/deque/detail/end_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/end_impl.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
                     deque_iterator<Sequence, Sequence::next_up::value>
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return type(seq);
diff --git a/include/boost/fusion/container/deque/detail/keyed_element.hpp b/include/boost/fusion/container/deque/detail/keyed_element.hpp
index 37aba9fd..834ef152 100644
--- a/include/boost/fusion/container/deque/detail/keyed_element.hpp
+++ b/include/boost/fusion/container/deque/detail/keyed_element.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion { namespace detail
         void get();
 
         template<typename It>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static nil_keyed_element
         from_iterator(It const&)
         {
@@ -43,7 +43,7 @@ namespace boost { namespace fusion { namespace detail
         using Rest::get;
 
         template <typename It>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static keyed_element
         from_iterator(It const& it)
         {
@@ -51,13 +51,13 @@ namespace boost { namespace fusion { namespace detail
                 *it, base::from_iterator(fusion::next(it)));
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element(keyed_element const& rhs)
           : Rest(rhs.get_base()), value_(rhs.value_)
         {}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element(keyed_element&& rhs)
           : Rest(BOOST_FUSION_FWD_ELEM(Rest, rhs.forward_base()))
           , value_(BOOST_FUSION_FWD_ELEM(Value, rhs.value_))
@@ -65,7 +65,7 @@ namespace boost { namespace fusion { namespace detail
 #endif
 
         template <typename U, typename Rst>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element(keyed_element<Key, U, Rst> const& rhs)
           : Rest(rhs.get_base()), value_(rhs.value_)
         {}
@@ -73,39 +73,39 @@ namespace boost { namespace fusion { namespace detail
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
-        Rest& get_base()
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        Rest& get_base() BOOST_NOEXCEPT
         {
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
-        Rest const& get_base() const
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        Rest const& get_base() const BOOST_NOEXCEPT
         {
             return *this;
         }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
-        Rest&& forward_base()
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        Rest&& forward_base() BOOST_NOEXCEPT
         {
             return BOOST_FUSION_FWD_ELEM(Rest, *static_cast<Rest*>(this));
         }
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename cref_result<Value>::type get(Key) const
         {
             return value_;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename ref_result<Value>::type get(Key)
         {
             return value_;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element(
             typename detail::call_param<Value>::type value
           , Rest const& rest)
@@ -113,20 +113,20 @@ namespace boost { namespace fusion { namespace detail
         {}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element(Value&& value, Rest&& rest)
             : Rest(BOOST_FUSION_FWD_ELEM(Rest, rest))
             , value_(BOOST_FUSION_FWD_ELEM(Value, value))
         {}
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element()
             : Rest(), value_()
         {}
 
         template<typename U, typename Rst>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element& operator=(keyed_element<Key, U, Rst> const& rhs)
         {
             base::operator=(static_cast<Rst const&>(rhs)); // cast for msvc-7.1
@@ -134,7 +134,7 @@ namespace boost { namespace fusion { namespace detail
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element& operator=(keyed_element const& rhs)
         {
             base::operator=(rhs);
@@ -143,7 +143,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         keyed_element& operator=(keyed_element&& rhs)
         {
             base::operator=(std::forward<keyed_element>(rhs));
diff --git a/include/boost/fusion/container/deque/front_extended_deque.hpp b/include/boost/fusion/container/deque/front_extended_deque.hpp
index 48f1574a..ab4cdf7c 100644
--- a/include/boost/fusion/container/deque/front_extended_deque.hpp
+++ b/include/boost/fusion/container/deque/front_extended_deque.hpp
@@ -27,20 +27,20 @@ namespace boost { namespace fusion
         typedef mpl::int_<(result_of::size<Deque>::value + 1)> size;
 
         template <typename Arg>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         front_extended_deque(Deque const& deque, Arg const& val)
           : base(val, deque)
         {}
 
 #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         template <typename Arg>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         front_extended_deque(Deque const& deque, Arg& val)
           : base(val, deque)
         {}
 #else
         template <typename Arg>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         front_extended_deque(Deque const& deque, Arg&& val)
           : base(BOOST_FUSION_FWD_ELEM(Arg, val), deque)
         {}
diff --git a/include/boost/fusion/container/generation/cons_tie.hpp b/include/boost/fusion/container/generation/cons_tie.hpp
index 5987fd5f..2058ebf5 100644
--- a/include/boost/fusion/container/generation/cons_tie.hpp
+++ b/include/boost/fusion/container/generation/cons_tie.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace fusion
 
     // $$$ do we really want a cons_tie? $$$
     template <typename Car>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline cons<Car&>
     cons_tie(Car& car)
     {
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
 
     // $$$ do we really want a cons_tie? $$$
     template <typename Car, typename Cdr>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline cons<Car&, Cdr>
     cons_tie(Car& car, Cdr const& cdr)
     {
diff --git a/include/boost/fusion/container/generation/deque_tie.hpp b/include/boost/fusion/container/generation/deque_tie.hpp
index 727d984f..8b6b9e7b 100644
--- a/include/boost/fusion/container/generation/deque_tie.hpp
+++ b/include/boost/fusion/container/generation/deque_tie.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
     }
 
     template <typename ...T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline deque<T&...>
     deque_tie(T&... arg)
     {
diff --git a/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp b/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
index eee53151..9146118e 100644
--- a/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
@@ -89,7 +89,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline deque<BOOST_PP_ENUM(N, BOOST_FUSION_REF, _)>
     deque_tie(BOOST_PP_ENUM_BINARY_PARAMS(N, T, & arg))
     {
diff --git a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
index 6f75fa4a..5635c73c 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
@@ -57,7 +57,8 @@ namespace boost { namespace fusion
         };
     }
 
-    BOOST_FUSION_GPU_ENABLED inline deque<>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline deque<>
     make_deque()
     {
         return deque<>();
@@ -102,7 +103,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline deque<BOOST_PP_ENUM(N, BOOST_FUSION_AS_FUSION_ELEMENT, _)>
     make_deque(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& arg))
     {
diff --git a/include/boost/fusion/container/generation/detail/pp_make_map.hpp b/include/boost/fusion/container/generation/detail/pp_make_map.hpp
index aef5fe40..ad20cd4d 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_map.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_map.hpp
@@ -59,7 +59,8 @@ namespace boost { namespace fusion
         };
     }
 
-    BOOST_FUSION_GPU_ENABLED inline map<>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline map<>
     make_map()
     {
         return map<>();
@@ -116,7 +117,7 @@ namespace boost { namespace fusion
         BOOST_PP_ENUM_PARAMS(N, typename K)
       , BOOST_PP_ENUM_PARAMS(N, typename D)
     >
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline map<BOOST_PP_ENUM(N, BOOST_FUSION_PAIR, _)>
     make_map(BOOST_PP_ENUM_BINARY_PARAMS(N, D, const& arg))
     {
diff --git a/include/boost/fusion/container/generation/detail/pp_map_tie.hpp b/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
index 8fde3409..1a53c919 100644
--- a/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
@@ -62,7 +62,8 @@ namespace boost { namespace fusion
         };
     }
 
-    BOOST_FUSION_GPU_ENABLED inline map<>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline map<>
     map_tie()
     {
         return map<>();
@@ -119,7 +120,7 @@ namespace boost { namespace fusion
         BOOST_PP_ENUM_PARAMS(N, typename K)
       , BOOST_PP_ENUM_PARAMS(N, typename D)
     >
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline map<BOOST_PP_ENUM(N, BOOST_FUSION_TIED_PAIR, _)>
     map_tie(BOOST_PP_ENUM_BINARY_PARAMS(N, D, & arg))
     {
diff --git a/include/boost/fusion/container/generation/ignore.hpp b/include/boost/fusion/container/generation/ignore.hpp
index 0bebade4..15ce15d4 100644
--- a/include/boost/fusion/container/generation/ignore.hpp
+++ b/include/boost/fusion/container/generation/ignore.hpp
@@ -17,7 +17,7 @@ namespace boost { namespace fusion
         struct swallow_assign
         {
             template<typename T>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             swallow_assign const&
             operator=(const T&) const
             {
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
     }
 
     //  "ignore" allows tuple positions to be ignored when using "tie".
-    detail::swallow_assign const ignore = detail::swallow_assign();
+    BOOST_CONSTEXPR detail::swallow_assign const ignore = detail::swallow_assign();
 }}
 
 #endif
diff --git a/include/boost/fusion/container/generation/list_tie.hpp b/include/boost/fusion/container/generation/list_tie.hpp
index 2fa8c659..1dccb515 100644
--- a/include/boost/fusion/container/generation/list_tie.hpp
+++ b/include/boost/fusion/container/generation/list_tie.hpp
@@ -89,7 +89,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline list<BOOST_PP_ENUM(N, BOOST_FUSION_REF, _)>
     list_tie(BOOST_PP_ENUM_BINARY_PARAMS(N, T, & arg))
     {
diff --git a/include/boost/fusion/container/generation/make_cons.hpp b/include/boost/fusion/container/generation/make_cons.hpp
index bb844ea3..616f1105 100644
--- a/include/boost/fusion/container/generation/make_cons.hpp
+++ b/include/boost/fusion/container/generation/make_cons.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Car>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline cons<typename detail::as_fusion_element<Car>::type>
     make_cons(Car const& car)
     {
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Car, typename Cdr>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline cons<typename detail::as_fusion_element<Car>::type, Cdr>
     make_cons(Car const& car, Cdr const& cdr)
     {
diff --git a/include/boost/fusion/container/generation/make_deque.hpp b/include/boost/fusion/container/generation/make_deque.hpp
index 18e41304..cb802f9a 100644
--- a/include/boost/fusion/container/generation/make_deque.hpp
+++ b/include/boost/fusion/container/generation/make_deque.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion
     }
 
     template <typename ...T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline deque<typename detail::as_fusion_element<T>::type...>
     make_deque(T const&... arg)
     {
diff --git a/include/boost/fusion/container/generation/make_list.hpp b/include/boost/fusion/container/generation/make_list.hpp
index 8a9480e0..8cfc7e62 100644
--- a/include/boost/fusion/container/generation/make_list.hpp
+++ b/include/boost/fusion/container/generation/make_list.hpp
@@ -56,7 +56,8 @@ namespace boost { namespace fusion
         };
     }
 
-    BOOST_FUSION_GPU_ENABLED inline list<>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline list<>
     make_list()
     {
         return list<>();
@@ -101,7 +102,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline list<BOOST_PP_ENUM(N, BOOST_FUSION_AS_FUSION_ELEMENT, _)>
     make_list(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& arg))
     {
diff --git a/include/boost/fusion/container/generation/make_map.hpp b/include/boost/fusion/container/generation/make_map.hpp
index d2eb16e2..a6538f81 100644
--- a/include/boost/fusion/container/generation/make_map.hpp
+++ b/include/boost/fusion/container/generation/make_map.hpp
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
     }
 
     template <typename ...Key, typename ...T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline map<
         fusion::pair<
             Key
diff --git a/include/boost/fusion/container/generation/make_set.hpp b/include/boost/fusion/container/generation/make_set.hpp
index 5530ec59..0bde4a9c 100644
--- a/include/boost/fusion/container/generation/make_set.hpp
+++ b/include/boost/fusion/container/generation/make_set.hpp
@@ -13,6 +13,7 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>
+#include <boost/fusion/support/config.hpp>
 #include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/support/pair.hpp>
@@ -35,6 +36,7 @@
 
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
 #pragma wave option(preserve: 1)
+#define FUSION_HASH #
 #endif
 
 namespace boost { namespace fusion
@@ -57,7 +59,22 @@ namespace boost { namespace fusion
         };
     }
 
-    BOOST_FUSION_GPU_ENABLED inline set<>
+    // XXX:
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+FUSION_HASH else
+    BOOST_CONSTEXPR
+FUSION_HASH endif
+#else
+#if defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+#else
+    BOOST_CONSTEXPR
+#endif
+#endif
+    BOOST_FUSION_GPU_ENABLED
+    inline set<>
     make_set()
     {
         return set<>();
@@ -76,6 +93,7 @@ namespace boost { namespace fusion
 }}
 
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+#undef FUSION_HASH
 #pragma wave option(output: null)
 #endif
 
@@ -103,7 +121,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline set<BOOST_PP_ENUM(N, BOOST_FUSION_AS_FUSION_ELEMENT, _)>
     make_set(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& arg))
     {
diff --git a/include/boost/fusion/container/generation/make_vector.hpp b/include/boost/fusion/container/generation/make_vector.hpp
index ed089869..57cd9b10 100644
--- a/include/boost/fusion/container/generation/make_vector.hpp
+++ b/include/boost/fusion/container/generation/make_vector.hpp
@@ -56,7 +56,8 @@ namespace boost { namespace fusion
         };
     }
 
-    BOOST_FUSION_GPU_ENABLED inline vector0<>
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline vector0<>
     make_vector()
     {
         return vector0<>();
@@ -101,7 +102,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM(N, BOOST_FUSION_AS_FUSION_ELEMENT, _)>
     make_vector(BOOST_PP_ENUM_BINARY_PARAMS(N, T, const& arg))
     {
diff --git a/include/boost/fusion/container/generation/map_tie.hpp b/include/boost/fusion/container/generation/map_tie.hpp
index 4a988d42..259eee5f 100644
--- a/include/boost/fusion/container/generation/map_tie.hpp
+++ b/include/boost/fusion/container/generation/map_tie.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
     }
 
     template <typename ...Key, typename ...T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline map<fusion::pair<Key, T&>...>
     map_tie(T&... arg)
     {
diff --git a/include/boost/fusion/container/generation/pair_tie.hpp b/include/boost/fusion/container/generation/pair_tie.hpp
index b4fbc780..2ba128f5 100644
--- a/include/boost/fusion/container/generation/pair_tie.hpp
+++ b/include/boost/fusion/container/generation/pair_tie.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion {
     }
 
     template<typename Key, typename T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename disable_if<is_const<T>, typename result_of::pair_tie<Key, T>::type>::type
     pair_tie(T& t)
     {
@@ -35,7 +35,7 @@ namespace boost { namespace fusion {
     }
 
     template<typename Key, typename T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     typename result_of::pair_tie<Key, T const>::type
     pair_tie(T const& t)
     {
diff --git a/include/boost/fusion/container/generation/vector_tie.hpp b/include/boost/fusion/container/generation/vector_tie.hpp
index 4c62edc8..28efa3bd 100644
--- a/include/boost/fusion/container/generation/vector_tie.hpp
+++ b/include/boost/fusion/container/generation/vector_tie.hpp
@@ -87,7 +87,7 @@ namespace boost { namespace fusion
     }
 
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline vector<BOOST_PP_ENUM(N, BOOST_FUSION_REF, _)>
     vector_tie(BOOST_PP_ENUM_BINARY_PARAMS(N, T, & arg))
     {
diff --git a/include/boost/fusion/container/list/cons.hpp b/include/boost/fusion/container/list/cons.hpp
index 575e4d9e..61d8dbcf 100644
--- a/include/boost/fusion/container/list/cons.hpp
+++ b/include/boost/fusion/container/list/cons.hpp
@@ -49,31 +49,31 @@ namespace boost { namespace fusion
         typedef Car car_type;
         typedef Cdr cdr_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons()
             : car(), cdr() {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit cons(typename detail::call_param<Car>::type in_car)
             : car(in_car), cdr() {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons(
             typename detail::call_param<Car>::type in_car
           , typename detail::call_param<Cdr>::type in_cdr)
             : car(in_car), cdr(in_cdr) {}
         
         template <typename Car2, typename Cdr2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons(cons<Car2, Cdr2> const& rhs)
             : car(rhs.car), cdr(rhs.cdr) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons(cons const& rhs)
             : car(rhs.car), cdr(rhs.cdr) {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons(
             Sequence const& seq
           , typename boost::enable_if<
@@ -86,13 +86,13 @@ namespace boost { namespace fusion
             , cdr(fusion::next(fusion::begin(seq)), mpl::true_()) {}
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons(Iterator const& iter, mpl::true_ /*this_is_an_iterator*/)
             : car(*iter)
             , cdr(fusion::next(iter), mpl::true_()) {}
 
         template <typename Car2, typename Cdr2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons& operator=(cons<Car2, Cdr2> const& rhs)
         {
             car = rhs.car;
@@ -100,7 +100,7 @@ namespace boost { namespace fusion
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         cons& operator=(cons const& rhs)
         {
             car = rhs.car;
@@ -109,7 +109,7 @@ namespace boost { namespace fusion
         }
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::enable_if<
             mpl::and_<
                 traits::is_sequence<Sequence>
@@ -124,7 +124,7 @@ namespace boost { namespace fusion
         }
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         void assign_from_iter(Iterator const& iter)
         {
             car = *iter;
diff --git a/include/boost/fusion/container/list/cons_iterator.hpp b/include/boost/fusion/container/list/cons_iterator.hpp
index da694756..1308d987 100644
--- a/include/boost/fusion/container/list/cons_iterator.hpp
+++ b/include/boost/fusion/container/list/cons_iterator.hpp
@@ -36,8 +36,8 @@ namespace boost { namespace fusion
             typename add_const<Cons>::type> 
         identity;
 
-        BOOST_FUSION_GPU_ENABLED
-        explicit cons_iterator(cons_type& in_cons)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit cons_iterator(cons_type& in_cons) BOOST_NOEXCEPT
             : cons(in_cons) {}
 
         cons_type& cons;
@@ -55,46 +55,47 @@ namespace boost { namespace fusion
         typedef cons_iterator_identity<
             add_const<nil_>::type> 
         identity;
+
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        nil_iterator() {}
+        nil_iterator() BOOST_NOEXCEPT {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        explicit nil_iterator(nil_ const&) {}
+        explicit nil_iterator(nil_ const&) BOOST_NOEXCEPT {}
     };
 
     template <>
     struct cons_iterator<nil_> : nil_iterator 
     {
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        cons_iterator() {}
+        cons_iterator() BOOST_NOEXCEPT {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        explicit cons_iterator(nil_ const&) {}
+        explicit cons_iterator(nil_ const&) BOOST_NOEXCEPT {}
     };
 
     template <>
     struct cons_iterator<nil_ const> : nil_iterator 
     {
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        cons_iterator() {}
+        cons_iterator() BOOST_NOEXCEPT {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        explicit cons_iterator(nil_ const&) {}
+        explicit cons_iterator(nil_ const&) BOOST_NOEXCEPT {}
     };
 
     template <>
     struct cons_iterator<list<> > : nil_iterator 
     {
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        cons_iterator() {}
+        cons_iterator() BOOST_NOEXCEPT {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        explicit cons_iterator(nil_ const&) {}
+        explicit cons_iterator(nil_ const&) BOOST_NOEXCEPT {}
     };
 
     template <>
     struct cons_iterator<list<> const> : nil_iterator 
     {
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        cons_iterator() {}
+        cons_iterator() BOOST_NOEXCEPT {}
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        explicit cons_iterator(nil_ const&) {}
+        explicit cons_iterator(nil_ const&) BOOST_NOEXCEPT {}
     };
 }}
 
diff --git a/include/boost/fusion/container/list/convert.hpp b/include/boost/fusion/container/list/convert.hpp
index f34ad396..d85fafeb 100644
--- a/include/boost/fusion/container/list/convert.hpp
+++ b/include/boost/fusion/container/list/convert.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
 
             typedef typename build_cons::type type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Sequence& seq)
             {
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_list<Sequence>::type
     as_list(Sequence& seq)
     {
@@ -49,7 +49,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_list<Sequence const>::type
     as_list(Sequence const& seq)
     {
diff --git a/include/boost/fusion/container/list/detail/at_impl.hpp b/include/boost/fusion/container/list/detail/at_impl.hpp
index b7688522..ab36665c 100644
--- a/include/boost/fusion/container/list/detail/at_impl.hpp
+++ b/include/boost/fusion/container/list/detail/at_impl.hpp
@@ -107,7 +107,7 @@ namespace boost { namespace fusion
                 type;
 
                 template <typename Cons, int N2>
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Cons& s, mpl::int_<N2>)
                 {
@@ -115,14 +115,14 @@ namespace boost { namespace fusion
                 }
 
                 template <typename Cons>
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Cons& s, mpl::int_<0>)
                 {
                     return s.car;
                 }
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/container/list/detail/begin_impl.hpp b/include/boost/fusion/container/list/detail/begin_impl.hpp
index a3022345..088b382d 100644
--- a/include/boost/fusion/container/list/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/list/detail/begin_impl.hpp
@@ -36,8 +36,8 @@ namespace boost { namespace fusion
             struct apply
             {
                 typedef cons_iterator<Sequence> type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& t)
                 {
diff --git a/include/boost/fusion/container/list/detail/build_cons.hpp b/include/boost/fusion/container/list/detail/build_cons.hpp
index 0f407008..206af1f1 100644
--- a/include/boost/fusion/container/list/detail/build_cons.hpp
+++ b/include/boost/fusion/container/list/detail/build_cons.hpp
@@ -26,8 +26,8 @@ namespace boost { namespace fusion { namespace detail
     struct build_cons<First, Last, true>
     {
         typedef nil_ type;
-        
-        BOOST_FUSION_GPU_ENABLED
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static nil_
         call(First const&, Last const&)
         {
@@ -38,7 +38,7 @@ namespace boost { namespace fusion { namespace detail
     template <typename First, typename Last>
     struct build_cons<First, Last, false>
     {
-        typedef  
+        typedef
             build_cons<typename result_of::next<First>::type, Last>
         next_build_cons;
 
@@ -47,7 +47,7 @@ namespace boost { namespace fusion { namespace detail
           , typename next_build_cons::type> 
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const& f, Last const& l)
         {
diff --git a/include/boost/fusion/container/list/detail/convert_impl.hpp b/include/boost/fusion/container/list/detail/convert_impl.hpp
index 000280e7..ff010186 100644
--- a/include/boost/fusion/container/list/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/list/detail/convert_impl.hpp
@@ -39,7 +39,7 @@ namespace boost { namespace fusion
 
                 typedef typename build_cons::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/container/list/detail/deref_impl.hpp b/include/boost/fusion/container/list/detail/deref_impl.hpp
index aefffd75..3358a2a2 100644
--- a/include/boost/fusion/container/list/detail/deref_impl.hpp
+++ b/include/boost/fusion/container/list/detail/deref_impl.hpp
@@ -27,18 +27,18 @@ namespace boost { namespace fusion
         struct deref_impl<cons_iterator_tag>
         {
             template <typename Iterator>
-            struct apply 
+            struct apply
             {
                 typedef typename Iterator::cons_type cons_type;
                 typedef typename cons_type::car_type value_type;
-    
+
                 typedef typename mpl::eval_if<
                     is_const<cons_type>
                   , add_reference<typename add_const<value_type>::type>
                   , add_reference<value_type> >::type
                 type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/container/list/detail/end_impl.hpp b/include/boost/fusion/container/list/detail/end_impl.hpp
index 9220d24a..6ed05a5f 100644
--- a/include/boost/fusion/container/list/detail/end_impl.hpp
+++ b/include/boost/fusion/container/list/detail/end_impl.hpp
@@ -33,13 +33,13 @@ namespace boost { namespace fusion
         struct end_impl<cons_tag>
         {
             template <typename Sequence>
-            struct apply 
+            struct apply
             {
                 typedef cons_iterator<
                     typename mpl::if_<is_const<Sequence>, nil_ const, nil_>::type>
                 type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence&)
                 {
diff --git a/include/boost/fusion/container/list/detail/equal_to_impl.hpp b/include/boost/fusion/container/list/detail/equal_to_impl.hpp
index 0cbb6bef..a0fc297f 100644
--- a/include/boost/fusion/container/list/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/container/list/detail/equal_to_impl.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace fusion
         struct equal_to_impl<cons_iterator_tag>
         {
             template <typename I1, typename I2>
-            struct apply             
+            struct apply
                 : is_same<
                     typename I1::identity
                   , typename I2::identity
diff --git a/include/boost/fusion/container/list/detail/list_forward_ctor.hpp b/include/boost/fusion/container/list/detail/list_forward_ctor.hpp
index fe652ae6..a5c8aa66 100644
--- a/include/boost/fusion/container/list/detail/list_forward_ctor.hpp
+++ b/include/boost/fusion/container/list/detail/list_forward_ctor.hpp
@@ -34,7 +34,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #define N BOOST_PP_ITERATION()
 
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
 #if N == 1
     explicit
 #endif
diff --git a/include/boost/fusion/container/list/detail/list_to_cons_call.hpp b/include/boost/fusion/container/list/detail/list_to_cons_call.hpp
index 3135382f..fbae5800 100644
--- a/include/boost/fusion/container/list/detail/list_to_cons_call.hpp
+++ b/include/boost/fusion/container/list/detail/list_to_cons_call.hpp
@@ -26,7 +26,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #define N BOOST_PP_ITERATION()
 
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     static type
     call(BOOST_PP_ENUM_BINARY_PARAMS(
         N, typename detail::call_param<T, >::type arg))
diff --git a/include/boost/fusion/container/list/detail/next_impl.hpp b/include/boost/fusion/container/list/detail/next_impl.hpp
index 7383a963..f766458b 100644
--- a/include/boost/fusion/container/list/detail/next_impl.hpp
+++ b/include/boost/fusion/container/list/detail/next_impl.hpp
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
             {
                 typedef typename Iterator::cons_type cons_type;
                 typedef typename cons_type::cdr_type cdr_type;
-    
+
                 typedef cons_iterator<
                     typename mpl::eval_if<
                         is_const<cons_type>
@@ -44,8 +44,8 @@ namespace boost { namespace fusion
                       , mpl::identity<cdr_type>
                     >::type>
                 type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/container/list/detail/reverse_cons.hpp b/include/boost/fusion/container/list/detail/reverse_cons.hpp
index f80e2c2d..14905180 100644
--- a/include/boost/fusion/container/list/detail/reverse_cons.hpp
+++ b/include/boost/fusion/container/list/detail/reverse_cons.hpp
@@ -22,7 +22,7 @@ namespace boost { namespace fusion { namespace detail
         typedef reverse_cons<Cdr, cons<Car, State> > impl;
         typedef typename impl::type type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(cons<Car, Cdr> const &cons, State const &state = State())
         {
             typedef fusion::cons<Car, State> cdr_type;
@@ -35,7 +35,7 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef State type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static State const &call(nil_ const &, State const &state = State())
         {
             return state;
diff --git a/include/boost/fusion/container/list/detail/value_at_impl.hpp b/include/boost/fusion/container/list/detail/value_at_impl.hpp
index ea9a8593..8b288a12 100644
--- a/include/boost/fusion/container/list/detail/value_at_impl.hpp
+++ b/include/boost/fusion/container/list/detail/value_at_impl.hpp
@@ -26,9 +26,9 @@ namespace boost { namespace fusion
         struct value_at_impl<cons_tag>
         {
             template <typename Sequence, typename N>
-            struct apply 
+            struct apply
             {
-                typedef typename 
+                typedef typename
                     mpl::eval_if<
                         mpl::bool_<N::value == 0>
                       , mpl::identity<typename Sequence::car_type>
diff --git a/include/boost/fusion/container/list/detail/value_of_impl.hpp b/include/boost/fusion/container/list/detail/value_of_impl.hpp
index daabe411..9e7aa208 100644
--- a/include/boost/fusion/container/list/detail/value_of_impl.hpp
+++ b/include/boost/fusion/container/list/detail/value_of_impl.hpp
@@ -21,7 +21,7 @@ namespace boost { namespace fusion
         struct value_of_impl<cons_iterator_tag>
         {
             template <typename Iterator>
-            struct apply 
+            struct apply
             {
                 typedef typename Iterator::cons_type cons_type;
                 typedef typename cons_type::car_type type;
diff --git a/include/boost/fusion/container/list/list.hpp b/include/boost/fusion/container/list/list.hpp
index 7f71856d..5b584131 100644
--- a/include/boost/fusion/container/list/list.hpp
+++ b/include/boost/fusion/container/list/list.hpp
@@ -50,17 +50,17 @@ namespace boost { namespace fusion
     public:
         typedef typename list_to_cons::type inherited_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         list()
             : inherited_type() {}
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_LIST_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         list(list<BOOST_PP_ENUM_PARAMS(FUSION_MAX_LIST_SIZE, U)> const& rhs)
             : inherited_type(rhs) {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         list(Sequence const& rhs
             , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : inherited_type(rhs) {}
@@ -75,7 +75,7 @@ namespace boost { namespace fusion
         #include <boost/fusion/container/list/detail/list_forward_ctor.hpp>
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_LIST_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         list&
         operator=(list<BOOST_PP_ENUM_PARAMS(FUSION_MAX_LIST_SIZE, U)> const& rhs)
         {
@@ -84,7 +84,7 @@ namespace boost { namespace fusion
         }
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::enable_if<traits::is_sequence<Sequence>, list&>::type
         operator=(Sequence const& rhs)
         {
diff --git a/include/boost/fusion/container/list/nil.hpp b/include/boost/fusion/container/list/nil.hpp
index ef909c97..1b2c2349 100644
--- a/include/boost/fusion/container/list/nil.hpp
+++ b/include/boost/fusion/container/list/nil.hpp
@@ -32,16 +32,16 @@ namespace boost { namespace fusion
         typedef void_ cdr_type;
 
         BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
-        nil_() {}
+        nil_() BOOST_NOEXCEPT {}
 
         template <typename Iterator>
         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*/) BOOST_NOEXCEPT
         {}
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
-        void assign_from_iter(Iterator const& /*iter*/)
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        void assign_from_iter(Iterator const& /*iter*/) BOOST_NOEXCEPT
         {
         }
     };
diff --git a/include/boost/fusion/container/map/convert.hpp b/include/boost/fusion/container/map/convert.hpp
index d106610b..10431c84 100644
--- a/include/boost/fusion/container/map/convert.hpp
+++ b/include/boost/fusion/container/map/convert.hpp
@@ -17,7 +17,7 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef typename result_of::value_of<It>::type type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type call(It const& it)
         {
             return *it;
@@ -31,7 +31,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::value_of_data<It>::type data_type;
         typedef typename fusion::pair<key_type, data_type> type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type call(It const& it)
         {
             return type(deref_data(it));
@@ -69,7 +69,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_map<Sequence>::type
     as_map(Sequence& seq)
     {
@@ -78,7 +78,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_map<Sequence const>::type
     as_map(Sequence const& seq)
     {
@@ -101,7 +101,7 @@ namespace boost { namespace fusion
                     result_of::as_map<Sequence>::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     typedef result_of::as_map<Sequence> gen;
diff --git a/include/boost/fusion/container/map/detail/at_impl.hpp b/include/boost/fusion/container/map/detail/at_impl.hpp
index ce9d7a63..ab35870f 100644
--- a/include/boost/fusion/container/map/detail/at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/at_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                     decltype(boost::declval<Sequence>().get(index()))
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& m)
                 {
@@ -47,7 +47,7 @@ namespace boost { namespace fusion
                     decltype(boost::declval<Sequence const>().get(index()))
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence const& m)
                 {
diff --git a/include/boost/fusion/container/map/detail/at_key_impl.hpp b/include/boost/fusion/container/map/detail/at_key_impl.hpp
index 81ca6156..a546bd00 100644
--- a/include/boost/fusion/container/map/detail/at_key_impl.hpp
+++ b/include/boost/fusion/container/map/detail/at_key_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
                     decltype(boost::declval<Sequence>().get(mpl::identity<Key>()))
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& m)
                 {
@@ -48,7 +48,7 @@ namespace boost { namespace fusion
                     decltype(boost::declval<Sequence const>().get(mpl::identity<Key>()))
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence const& m)
                 {
diff --git a/include/boost/fusion/container/map/detail/begin_impl.hpp b/include/boost/fusion/container/map/detail/begin_impl.hpp
index 9c8f4acb..65b39d1f 100644
--- a/include/boost/fusion/container/map/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/map/detail/begin_impl.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
             {
                 typedef map_iterator<Sequence, 0> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return type(seq);
diff --git a/include/boost/fusion/container/map/detail/build_map.hpp b/include/boost/fusion/container/map/detail/build_map.hpp
index f5a6875f..d8f3f33f 100644
--- a/include/boost/fusion/container/map/detail/build_map.hpp
+++ b/include/boost/fusion/container/map/detail/build_map.hpp
@@ -28,7 +28,7 @@ namespace boost { namespace fusion { namespace detail
     struct build_map<First, Last, is_assoc, true>
     {
         typedef map<> type;
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const&, Last const&)
         {
@@ -44,7 +44,7 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef map<T, Rest...> type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(T const& first, map<Rest...> const& rest)
         {
@@ -66,7 +66,7 @@ namespace boost { namespace fusion { namespace detail
 
         typedef typename push_front::type type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type
         call(First const& f, Last const& l)
         {
diff --git a/include/boost/fusion/container/map/detail/cpp03/as_map.hpp b/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
index 4af79522..efa836ba 100644
--- a/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
@@ -37,7 +37,7 @@ BOOST_FUSION_BARRIER_BEGIN
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator)
         {
@@ -127,7 +127,7 @@ BOOST_FUSION_BARRIER_END
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator const& i0)
         {
diff --git a/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
index 8a3209d7..b1044d7d 100644
--- a/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
@@ -27,14 +27,14 @@ namespace boost { namespace fusion
         struct at_impl<map_tag>
         {
             template <typename Sequence, typename N>
-            struct apply 
+            struct apply
             {
-                typedef typename 
-                    mpl::at<typename Sequence::storage_type::types, N>::type 
+                typedef typename
+                    mpl::at<typename Sequence::storage_type::types, N>::type
                 element;
                 typedef typename detail::ref_result<element>::type type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& m)
                 {
@@ -45,12 +45,12 @@ namespace boost { namespace fusion
             template <typename Sequence, typename N>
             struct apply<Sequence const, N>
             {
-                typedef typename 
-                    mpl::at<typename Sequence::storage_type::types, N>::type 
+                typedef typename
+                    mpl::at<typename Sequence::storage_type::types, N>::type
                 element;
                 typedef typename detail::cref_result<element>::type type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence const& m)
                 {
diff --git a/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp
index 5fe1466e..6255ed88 100644
--- a/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/begin_impl.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/container/map/detail/cpp03/convert.hpp b/include/boost/fusion/container/map/detail/cpp03/convert.hpp
index a03840ce..c5cc3bd6 100644
--- a/include/boost/fusion/container/map/detail/cpp03/convert.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/convert.hpp
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_map<Sequence>::type
     as_map(Sequence& seq)
     {
@@ -45,7 +45,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_map<Sequence const>::type
     as_map(Sequence const& seq)
     {
diff --git a/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
index 14a821e8..3a773d74 100644
--- a/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
                     template apply<typename result_of::begin<Sequence>::type>::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return gen::call(fusion::begin(seq));
diff --git a/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp
index 7be6fd96..ccaa2910 100644
--- a/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/deref_data_impl.hpp
@@ -36,7 +36,7 @@ namespace boost { namespace fusion { namespace extension
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp
index 260c5dfd..7fa01c3f 100644
--- a/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/deref_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion { namespace extension
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp
index 33940c7a..2830b955 100644
--- a/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/end_impl.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/container/map/detail/cpp03/map.hpp b/include/boost/fusion/container/map/detail/cpp03/map.hpp
index 8673895e..25178fe8 100644
--- a/include/boost/fusion/container/map/detail/cpp03/map.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/map.hpp
@@ -65,35 +65,35 @@ namespace boost { namespace fusion
 
         typedef typename storage_type::size size;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map()
             : data() {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(Sequence const& rhs)
             : data(rhs) {}
 
         #include <boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp>
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map& operator=(T const& rhs)
         {
             data = rhs;
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map& operator=(map const& rhs)
         {
             data = rhs.data;
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         storage_type& get_data() { return data; }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         storage_type const& get_data() const { return data; }
 
     private:
diff --git a/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp b/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
index 3938f9a4..8cf9fa48 100644
--- a/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
@@ -27,7 +27,7 @@
 
 #define N BOOST_PP_ITERATION()
 
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
 #if N == 1
     explicit
 #endif
diff --git a/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
index d61ab203..2af55396 100644
--- a/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion
         struct value_at_impl<map_tag>
         {
             template <typename Sequence, typename N>
-            struct apply 
+            struct apply
             {
                 typedef typename mpl::at<typename Sequence::storage_type::types, N>::type type;
             };
diff --git a/include/boost/fusion/container/map/detail/end_impl.hpp b/include/boost/fusion/container/map/detail/end_impl.hpp
index fea45db3..50dec8ef 100644
--- a/include/boost/fusion/container/map/detail/end_impl.hpp
+++ b/include/boost/fusion/container/map/detail/end_impl.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
             {
                 typedef map_iterator<Sequence, Sequence::size::value> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return type(seq);
diff --git a/include/boost/fusion/container/map/detail/map_impl.hpp b/include/boost/fusion/container/map/detail/map_impl.hpp
index 4b4baadb..c62145ba 100644
--- a/include/boost/fusion/container/map/detail/map_impl.hpp
+++ b/include/boost/fusion/container/map/detail/map_impl.hpp
@@ -33,24 +33,24 @@ namespace boost { namespace fusion { namespace detail
         static int const index = index_;
         static int const size = 0;
 
-        BOOST_FUSION_GPU_ENABLED
-        map_impl() {}
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        map_impl() BOOST_NOEXCEPT {}
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
-        map_impl(Iterator const&, map_impl_from_iterator)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        map_impl(Iterator const&, map_impl_from_iterator) BOOST_NOEXCEPT
         {}
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
-        void assign(Iterator const&, map_impl_from_iterator)
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        void assign(Iterator const&, map_impl_from_iterator) BOOST_NOEXCEPT
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         void get();
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         void get_val();
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         void get_key();
     };
 
@@ -71,54 +71,54 @@ namespace boost { namespace fusion { namespace detail
         typedef typename Pair::first_type key_type;
         typedef typename Pair::second_type value_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl()
           : rest_type(), element()
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl(map_impl const& rhs)
           : rest_type(rhs.get_base()), element(rhs.element)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl(map_impl&& rhs)
           : rest_type(BOOST_FUSION_FWD_ELEM(rest_type, *static_cast<rest_type*>(&rhs)))
           , element(BOOST_FUSION_FWD_ELEM(Pair, rhs.element))
         {}
 
         template <typename ...U>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl(map_impl<index, U...> const& rhs)
           : rest_type(rhs.get_base()), element(rhs.element)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl(typename detail::call_param<Pair>::type element_
           , typename detail::call_param<T>::type... rest)
           : rest_type(rest...), element(element_)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl(Pair&& element_, T&&... rest)
           : rest_type(BOOST_FUSION_FWD_ELEM(T, rest)...)
           , element(BOOST_FUSION_FWD_ELEM(Pair, element_))
         {}
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl(Iterator const& iter, map_impl_from_iterator fi)
           : rest_type(fusion::next(iter), fi)
           , element(*iter)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         rest_type& get_base()
         {
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         rest_type const& get_base() const
         {
             return *this;
@@ -138,28 +138,28 @@ namespace boost { namespace fusion { namespace detail
         BOOST_FUSION_GPU_ENABLED
         mpl::identity<key_type> get_key(mpl::int_<index>) const;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename cref_result<value_type>::type
         get(mpl::identity<key_type>) const
         {
             return element.second;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename ref_result<value_type>::type
         get(mpl::identity<key_type>)
         {
             return element.second;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename cref_result<pair_type>::type
         get(mpl::int_<index>) const
         {
             return element;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename ref_result<pair_type>::type
         get(mpl::int_<index>)
         {
@@ -167,7 +167,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename ...U>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl& operator=(map_impl<index, U...> const& rhs)
         {
             rest_type::operator=(rhs);
@@ -175,7 +175,7 @@ namespace boost { namespace fusion { namespace detail
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl& operator=(map_impl const& rhs)
         {
             rest_type::operator=(rhs);
@@ -183,7 +183,7 @@ namespace boost { namespace fusion { namespace detail
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_impl& operator=(map_impl&& rhs)
         {
             rest_type::operator=(std::forward<map_impl>(rhs));
@@ -192,7 +192,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         void assign(Iterator const& iter, map_impl_from_iterator fi)
         {
             rest_type::assign(fusion::next(iter), fi);
diff --git a/include/boost/fusion/container/map/map.hpp b/include/boost/fusion/container/map/map.hpp
index 1d308e96..f93a693f 100644
--- a/include/boost/fusion/container/map/map.hpp
+++ b/include/boost/fusion/container/map/map.hpp
@@ -52,60 +52,60 @@ namespace boost { namespace fusion
         typedef mpl::int_<base_type::size> size;
         typedef mpl::false_ is_view;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map() {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(map const& seq)
           : base_type(seq.base())
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(map&& seq)
           : base_type(std::forward<map>(seq))
         {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(Sequence const& seq
           , typename enable_if<traits::is_sequence<Sequence>>::type* /*dummy*/ = 0)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(Sequence& seq
           , typename enable_if<traits::is_sequence<Sequence>>::type* /*dummy*/ = 0)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(Sequence&& seq
           , typename enable_if<traits::is_sequence<Sequence>>::type* /*dummy*/ = 0)
           : base_type(begin(seq), detail::map_impl_from_iterator())
         {}
 
         template <typename First, typename ...T_>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(First const& first, T_ const&... rest)
           : base_type(first, rest...)
         {}
 
         template <typename First, typename ...T_>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map(First&& first, T_&&... rest)
           : base_type(BOOST_FUSION_FWD_ELEM(First, first), BOOST_FUSION_FWD_ELEM(T_, rest)...)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map& operator=(map const& rhs)
         {
             base_type::operator=(rhs.base());
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map& operator=(map&& rhs)
         {
             base_type::operator=(std::forward<base_type>(rhs.base()));
@@ -113,7 +113,7 @@ namespace boost { namespace fusion
         }
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename enable_if<traits::is_sequence<Sequence>, map&>::type
         operator=(Sequence const& seq)
         {
@@ -121,10 +121,10 @@ namespace boost { namespace fusion
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
-        base_type& base() { return *this; }
-        BOOST_FUSION_GPU_ENABLED
-        base_type const& base() const { return *this; }
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        base_type& base() BOOST_NOEXCEPT { return *this; }
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        base_type const& base() const BOOST_NOEXCEPT { return *this; }
     };
 }}
 
diff --git a/include/boost/fusion/container/map/map_iterator.hpp b/include/boost/fusion/container/map/map_iterator.hpp
index 4927e155..99f8add0 100644
--- a/include/boost/fusion/container/map/map_iterator.hpp
+++ b/include/boost/fusion/container/map/map_iterator.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
         typedef Seq sequence;
         typedef mpl::int_<Pos> index;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         map_iterator(Seq& seq)
             : seq_(seq)
         {}
@@ -73,7 +73,7 @@ namespace boost { namespace fusion
                 decltype(boost::declval<sequence>().get(index()))
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& it)
             {
@@ -99,7 +99,7 @@ namespace boost { namespace fusion
 
             typedef typename add_reference<second_type>::type type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& it)
             {
@@ -114,7 +114,7 @@ namespace boost { namespace fusion
             typedef typename Iterator::sequence sequence;
             typedef map_iterator<sequence, index::value + N::value> type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Iterator const& i)
             {
@@ -141,7 +141,7 @@ namespace boost { namespace fusion
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(I1 const&, I2 const&)
             {
diff --git a/include/boost/fusion/container/set/convert.hpp b/include/boost/fusion/container/set/convert.hpp
index 631c251d..81e064cd 100644
--- a/include/boost/fusion/container/set/convert.hpp
+++ b/include/boost/fusion/container/set/convert.hpp
@@ -29,7 +29,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_set<Sequence>::type
     as_set(Sequence& seq)
     {
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_set<Sequence const>::type
     as_set(Sequence const& seq)
     {
diff --git a/include/boost/fusion/container/set/detail/as_set.hpp b/include/boost/fusion/container/set/detail/as_set.hpp
index a1e8cb7b..a41498a3 100644
--- a/include/boost/fusion/container/set/detail/as_set.hpp
+++ b/include/boost/fusion/container/set/detail/as_set.hpp
@@ -37,7 +37,7 @@ BOOST_FUSION_BARRIER_BEGIN
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator)
         {
@@ -123,7 +123,7 @@ BOOST_FUSION_BARRIER_END
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator const& i0)
         {
diff --git a/include/boost/fusion/container/set/detail/begin_impl.hpp b/include/boost/fusion/container/set/detail/begin_impl.hpp
index df522b57..1ebd4e46 100644
--- a/include/boost/fusion/container/set/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/set/detail/begin_impl.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/container/set/detail/convert_impl.hpp b/include/boost/fusion/container/set/detail/convert_impl.hpp
index 4a24dff8..d9d5dcfc 100644
--- a/include/boost/fusion/container/set/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/set/detail/convert_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                     template apply<typename result_of::begin<Sequence>::type>::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return gen::call(fusion::begin(seq));
diff --git a/include/boost/fusion/container/set/detail/deref_impl.hpp b/include/boost/fusion/container/set/detail/deref_impl.hpp
index 4a43819d..e5da5219 100644
--- a/include/boost/fusion/container/set/detail/deref_impl.hpp
+++ b/include/boost/fusion/container/set/detail/deref_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion { namespace extension
                 >::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/container/set/detail/end_impl.hpp b/include/boost/fusion/container/set/detail/end_impl.hpp
index b793addc..fbae9b75 100644
--- a/include/boost/fusion/container/set/detail/end_impl.hpp
+++ b/include/boost/fusion/container/set/detail/end_impl.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace extension
                 >
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/container/set/detail/set_forward_ctor.hpp b/include/boost/fusion/container/set/detail/set_forward_ctor.hpp
index 460de434..5d396104 100644
--- a/include/boost/fusion/container/set/detail/set_forward_ctor.hpp
+++ b/include/boost/fusion/container/set/detail/set_forward_ctor.hpp
@@ -27,7 +27,7 @@
 
 #define N BOOST_PP_ITERATION()
 
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
 #if N == 1
     explicit
 #endif
diff --git a/include/boost/fusion/container/set/set.hpp b/include/boost/fusion/container/set/set.hpp
index 3d7bdfce..65a080b0 100644
--- a/include/boost/fusion/container/set/set.hpp
+++ b/include/boost/fusion/container/set/set.hpp
@@ -65,12 +65,12 @@ namespace boost { namespace fusion
 
         typedef typename storage_type::size size;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set()
             : data() {}
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set(Sequence const& rhs
             , typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
             : data(rhs) {}
@@ -78,7 +78,7 @@ namespace boost { namespace fusion
         #include <boost/fusion/container/set/detail/set_forward_ctor.hpp>
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         set&
         operator=(T const& rhs)
         {
@@ -86,9 +86,9 @@ namespace boost { namespace fusion
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         storage_type& get_data() { return data; }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         storage_type const& get_data() const { return data; }
 
     private:
diff --git a/include/boost/fusion/container/vector/convert.hpp b/include/boost/fusion/container/vector/convert.hpp
index 0582fe5c..adc7f478 100644
--- a/include/boost/fusion/container/vector/convert.hpp
+++ b/include/boost/fusion/container/vector/convert.hpp
@@ -29,7 +29,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_vector<Sequence>::type
     as_vector(Sequence& seq)
     {
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::as_vector<Sequence const>::type
     as_vector(Sequence const& seq)
     {
diff --git a/include/boost/fusion/container/vector/detail/advance_impl.hpp b/include/boost/fusion/container/vector/detail/advance_impl.hpp
index af45a1a8..3bf26a59 100644
--- a/include/boost/fusion/container/vector/detail/advance_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/advance_impl.hpp
@@ -18,7 +18,7 @@ namespace boost { namespace fusion
     {
         template <typename Tag>
         struct advance_impl;
-    
+
         template <>
         struct advance_impl<vector_iterator_tag>
         {
@@ -28,8 +28,8 @@ namespace boost { namespace fusion
                 typedef typename Iterator::index index;
                 typedef typename Iterator::vector vector;
                 typedef vector_iterator<vector, index::value+N::value> type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/container/vector/detail/as_vector.hpp b/include/boost/fusion/container/vector/detail/as_vector.hpp
index 368557d0..b5f5e2d0 100644
--- a/include/boost/fusion/container/vector/detail/as_vector.hpp
+++ b/include/boost/fusion/container/vector/detail/as_vector.hpp
@@ -37,7 +37,7 @@ BOOST_FUSION_BARRIER_BEGIN
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator)
         {
@@ -123,7 +123,7 @@ BOOST_FUSION_BARRIER_END
         };
 
         template <typename Iterator>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static typename apply<Iterator>::type
         call(Iterator const& i0)
         {
diff --git a/include/boost/fusion/container/vector/detail/at_impl.hpp b/include/boost/fusion/container/vector/detail/at_impl.hpp
index eb09b212..cb98dd4a 100644
--- a/include/boost/fusion/container/vector/detail/at_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/at_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                 typedef typename mpl::at<typename Sequence::types, N>::type element;
                 typedef typename detail::ref_result<element>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
@@ -46,7 +46,7 @@ namespace boost { namespace fusion
                 typedef typename mpl::at<typename Sequence::types, N>::type element;
                 typedef typename detail::cref_result<element>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence const& v)
                 {
diff --git a/include/boost/fusion/container/vector/detail/begin_impl.hpp b/include/boost/fusion/container/vector/detail/begin_impl.hpp
index 026b34ff..ef24cd74 100644
--- a/include/boost/fusion/container/vector/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/begin_impl.hpp
@@ -23,11 +23,11 @@ namespace boost { namespace fusion
         struct begin_impl<vector_tag>
         {
             template <typename Sequence>
-            struct apply 
+            struct apply
             {
                 typedef vector_iterator<Sequence, 0> type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
diff --git a/include/boost/fusion/container/vector/detail/convert_impl.hpp b/include/boost/fusion/container/vector/detail/convert_impl.hpp
index ddf42590..63bfb7c7 100644
--- a/include/boost/fusion/container/vector/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/convert_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                     template apply<typename result_of::begin<Sequence>::type>::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& seq)
                 {
                     return gen::call(fusion::begin(seq));
diff --git a/include/boost/fusion/container/vector/detail/deref_impl.hpp b/include/boost/fusion/container/vector/detail/deref_impl.hpp
index b338d2fe..5186aa10 100644
--- a/include/boost/fusion/container/vector/detail/deref_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/deref_impl.hpp
@@ -26,14 +26,14 @@ namespace boost { namespace fusion
         struct deref_impl<vector_iterator_tag>
         {
             template <typename Iterator>
-            struct apply 
+            struct apply
             {
                 typedef typename Iterator::vector vector;
                 typedef typename Iterator::index index;
                 typedef typename mpl::at<
                     typename vector::types, index>::type
                 element;
-                
+
                 typedef typename
                     mpl::if_<
                         is_const<vector>
@@ -42,7 +42,7 @@ namespace boost { namespace fusion
                     >::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/container/vector/detail/distance_impl.hpp b/include/boost/fusion/container/vector/detail/distance_impl.hpp
index 94835538..4c2a1226 100644
--- a/include/boost/fusion/container/vector/detail/distance_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/distance_impl.hpp
@@ -24,8 +24,8 @@ namespace boost { namespace fusion
         {
             template <typename First, typename Last>
             struct apply : mpl::minus<typename Last::index, typename First::index>
-            {    
-                BOOST_FUSION_GPU_ENABLED
+            {
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static typename mpl::minus<
                     typename Last::index, typename First::index>::type
                 call(First const&, Last const&)
diff --git a/include/boost/fusion/container/vector/detail/end_impl.hpp b/include/boost/fusion/container/vector/detail/end_impl.hpp
index 14c67157..a77ef644 100644
--- a/include/boost/fusion/container/vector/detail/end_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/end_impl.hpp
@@ -23,12 +23,12 @@ namespace boost { namespace fusion
         struct end_impl<vector_tag>
         {
             template <typename Sequence>
-            struct apply 
+            struct apply
             {
                 typedef typename Sequence::size size;
                 typedef vector_iterator<Sequence, size::value> type;
-    
-                BOOST_FUSION_GPU_ENABLED
+
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& v)
                 {
diff --git a/include/boost/fusion/container/vector/detail/equal_to_impl.hpp b/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
index 50420cc8..18b3e4a3 100644
--- a/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace fusion
         struct equal_to_impl<vector_iterator_tag>
         {
             template <typename I1, typename I2>
-            struct apply             
+            struct apply
                 : is_same<
                     typename I1::identity
                   , typename I2::identity
diff --git a/include/boost/fusion/container/vector/detail/next_impl.hpp b/include/boost/fusion/container/vector/detail/next_impl.hpp
index 78aef85d..28408205 100644
--- a/include/boost/fusion/container/vector/detail/next_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/next_impl.hpp
@@ -25,13 +25,13 @@ namespace boost { namespace fusion
         struct next_impl<vector_iterator_tag>
         {
             template <typename Iterator>
-            struct apply 
+            struct apply
             {
                 typedef typename Iterator::vector vector;
                 typedef typename Iterator::index index;
                 typedef vector_iterator<vector, index::value+1> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/container/vector/detail/prior_impl.hpp b/include/boost/fusion/container/vector/detail/prior_impl.hpp
index b3bdc55f..4d040d39 100644
--- a/include/boost/fusion/container/vector/detail/prior_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/prior_impl.hpp
@@ -25,13 +25,13 @@ namespace boost { namespace fusion
         struct prior_impl<vector_iterator_tag>
         {
             template <typename Iterator>
-            struct apply 
+            struct apply
             {
                 typedef typename Iterator::vector vector;
                 typedef typename Iterator::index index;
                 typedef vector_iterator<vector, index::value-1> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/container/vector/detail/value_at_impl.hpp b/include/boost/fusion/container/vector/detail/value_at_impl.hpp
index 9b94e9de..06402b43 100644
--- a/include/boost/fusion/container/vector/detail/value_at_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/value_at_impl.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion
         struct value_at_impl<vector_tag>
         {
             template <typename Sequence, typename N>
-            struct apply 
+            struct apply
             {
                 typedef typename mpl::at<typename Sequence::types, N>::type type;
             };
diff --git a/include/boost/fusion/container/vector/detail/value_of_impl.hpp b/include/boost/fusion/container/vector/detail/value_of_impl.hpp
index 7527d581..2a8acf91 100644
--- a/include/boost/fusion/container/vector/detail/value_of_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/value_of_impl.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace fusion
         struct value_of_impl<vector_iterator_tag>
         {
             template <typename Iterator>
-            struct apply 
+            struct apply
             {
                 typedef typename Iterator::vector vector;
                 typedef typename Iterator::index index;
diff --git a/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp b/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp
index ff8aaccd..8ec63607 100644
--- a/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp
+++ b/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp
@@ -26,6 +26,16 @@
 
 #define M BOOST_PP_ITERATION()
 
+    // XXX:
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CONSTEXPR
+#endif
+#endif
     BOOST_FUSION_GPU_ENABLED
 #if M == 1
     explicit
@@ -40,6 +50,16 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
     template <BOOST_PP_ENUM_PARAMS(M, typename U)>
+    // XXX:
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+#endif
+#endif
     BOOST_FUSION_GPU_ENABLED
 #if M == 1
     explicit
diff --git a/include/boost/fusion/container/vector/detail/vector_n.hpp b/include/boost/fusion/container/vector/detail/vector_n.hpp
index b7a910aa..932ce36c 100644
--- a/include/boost/fusion/container/vector/detail/vector_n.hpp
+++ b/include/boost/fusion/container/vector/detail/vector_n.hpp
@@ -41,9 +41,11 @@
         BOOST_PP_CAT(T, n)>(vec.BOOST_PP_CAT(m, n));
 
 #define FUSION_VECTOR_MEMBER_AT_IMPL(z, n, _)                                   \
-    BOOST_FUSION_GPU_ENABLED typename add_reference<T##n>::type                 \
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED                              \
+        typename add_reference<T##n>::type                                      \
         at_impl(mpl::int_<n>) { return this->m##n; }                            \
-    BOOST_FUSION_GPU_ENABLED typename add_reference<typename add_const<T##n>::type>::type \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                    \
+        typename add_reference<typename add_const<T##n>::type>::type            \
         at_impl(mpl::int_<n>) const { return this->m##n; }
 
 #define FUSION_VECTOR_MEMBER_ITER_DECL_VAR(z, n, _)                             \
@@ -59,7 +61,7 @@
     template <BOOST_PP_ENUM_PARAMS(N, typename T)>
     struct BOOST_PP_CAT(vector_data, N)
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector_data, N)()
             : BOOST_PP_ENUM(N, FUSION_VECTOR_CTOR_DEFAULT_INIT, _) {}
 
@@ -69,11 +71,22 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
         template <BOOST_PP_ENUM_PARAMS(N, typename U)>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, U, && arg)
           , typename boost::enable_if<is_convertible<U0, T0> >::type* /*dummy*/ = 0
         )
             : BOOST_PP_ENUM(N, FUSION_VECTOR_CTOR_ARG_FWD, arg) {}
+
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector_data, N)(
             BOOST_PP_CAT(vector_data, N)&& other)
             : BOOST_PP_ENUM(N, FUSION_VECTOR_CTOR_FORWARD, arg) {}
@@ -82,18 +95,27 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 FUSION_HASH endif
 #endif
 
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector_data, N)(
             BOOST_PP_ENUM_BINARY_PARAMS(
                 N, typename detail::call_param<T, >::type arg))
             : BOOST_PP_ENUM(N, FUSION_VECTOR_CTOR_INIT, arg) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector_data, N)(
             BOOST_PP_CAT(vector_data, N) const& other)
             : BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_CTOR_INIT, _) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector_data, N)&
         operator=(BOOST_PP_CAT(vector_data, N) const& vec)
         {
@@ -102,6 +124,15 @@ FUSION_HASH endif
         }
 
         template <typename Sequence>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         static BOOST_PP_CAT(vector_data, N)
         init_from_sequence(Sequence const& seq)
@@ -113,6 +144,15 @@ FUSION_HASH endif
         }
 
         template <typename Sequence>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         static BOOST_PP_CAT(vector_data, N)
         init_from_sequence(Sequence& seq)
@@ -140,9 +180,18 @@ FUSION_HASH endif
         typedef random_access_traversal_tag category;
         typedef mpl::int_<N> size;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)() {}
 
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
 #if (N == 1)
         explicit
@@ -158,6 +207,15 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
         template <BOOST_PP_ENUM_PARAMS(N, typename U)>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
 #if (N == 1)
         explicit
@@ -170,15 +228,15 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             : base_type(BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_FORWARD, arg)) {}
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N)&& rhs)
             : base_type(std::forward<base_type>(rhs)) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N) const& rhs)
             : base_type(static_cast<base_type const&>(rhs)) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)&
         operator=(BOOST_PP_CAT(vector, N) const& vec)
         {
@@ -186,7 +244,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)&
         operator=(BOOST_PP_CAT(vector, N)&& vec)
         {
@@ -199,12 +257,30 @@ FUSION_HASH endif
 #endif
 
         template <BOOST_PP_ENUM_PARAMS(N, typename U)>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+    BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)(
             BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, U)> const& vec)
             : base_type(BOOST_PP_ENUM_PARAMS(N, vec.m)) {}
 
         template <typename Sequence>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)(
             Sequence const& seq
@@ -216,6 +292,15 @@ FUSION_HASH endif
             : base_type(base_type::init_from_sequence(seq)) {}
 
         template <typename Sequence>
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+        BOOST_CXX14_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)(
             Sequence& seq
@@ -227,7 +312,7 @@ FUSION_HASH endif
             : base_type(base_type::init_from_sequence(seq)) {}
 
         template <BOOST_PP_ENUM_PARAMS(N, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         BOOST_PP_CAT(vector, N)&
         operator=(BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, U)> const& vec)
         {
@@ -236,7 +321,7 @@ FUSION_HASH endif
         }
 
         template <typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename boost::disable_if<is_convertible<Sequence, T0>, this_type&>::type
         operator=(Sequence const& seq)
         {
@@ -250,7 +335,7 @@ FUSION_HASH endif
         BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_AT_IMPL, _)
 
         template<typename I>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename add_reference<typename mpl::at<types, I>::type>::type
         at_impl(I)
         {
@@ -258,7 +343,7 @@ FUSION_HASH endif
         }
 
         template<typename I>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename add_reference<typename add_const<typename mpl::at<types, I>::type>::type>::type
         at_impl(I) const
         {
diff --git a/include/boost/fusion/container/vector/vector.hpp b/include/boost/fusion/container/vector/vector.hpp
index 6728fa40..c1cea915 100644
--- a/include/boost/fusion/container/vector/vector.hpp
+++ b/include/boost/fusion/container/vector/vector.hpp
@@ -31,7 +31,7 @@
     ctor_helper(rhs, is_base_of<vector, Sequence>())                          \
 
 #define BOOST_FUSION_VECTOR_CTOR_HELPER()                                     \
-    BOOST_FUSION_GPU_ENABLED                                                  \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                  \
     static vector_n const&                                                    \
     ctor_helper(vector const& rhs, mpl::true_)                                \
     {                                                                         \
@@ -39,7 +39,7 @@
     }                                                                         \
                                                                               \
     template <typename T>                                                     \
-    BOOST_FUSION_GPU_ENABLED                                                  \
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED                                  \
     static T const&                                                           \
     ctor_helper(T const& rhs, mpl::false_)                                    \
     {                                                                         \
@@ -102,20 +102,30 @@ namespace boost { namespace fusion
         typedef typename vector_n::category category;
         typedef typename vector_n::is_view is_view;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector()
             : vec() {}
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector(vector<BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, U)> const& rhs)
             : vec(rhs.vec) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector(vector const& rhs)
             : vec(rhs.vec) {}
 
         template <typename Sequence>
+        // XXX:
+#if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
+FUSION_HASH if !defined(BOOST_CLANG)
+        BOOST_CONSTEXPR
+FUSION_HASH endif
+#else
+#if !defined(BOOST_CLANG)
+        BOOST_CONSTEXPR
+#endif
+#endif
         BOOST_FUSION_GPU_ENABLED
         vector(Sequence const& rhs,
             typename boost::enable_if<traits::is_sequence<Sequence> >::type* = 0)
@@ -131,7 +141,7 @@ namespace boost { namespace fusion
         #include <boost/fusion/container/vector/detail/vector_forward_ctor.hpp>
 
         template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, typename U)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector&
         operator=(vector<BOOST_PP_ENUM_PARAMS(FUSION_MAX_VECTOR_SIZE, U)> const& rhs)
         {
@@ -140,7 +150,7 @@ namespace boost { namespace fusion
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector&
         operator=(T const& rhs)
         {
@@ -148,7 +158,7 @@ namespace boost { namespace fusion
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector&
         operator=(vector const& rhs)
         {
@@ -161,10 +171,11 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #endif
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) || \
     (defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES))
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector(vector&& rhs)
             : vec(std::forward<vector_n>(rhs.vec)) {}
-        BOOST_FUSION_GPU_ENABLED
+
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector&
         operator=(vector&& rhs)
         {
@@ -173,7 +184,7 @@ FUSION_HASH if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector&
         operator=(T&& rhs)
         {
@@ -186,7 +197,7 @@ FUSION_HASH endif
 #endif
 
         template <int N>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename add_reference<
             typename mpl::at_c<types, N>::type
         >::type
@@ -196,7 +207,7 @@ FUSION_HASH endif
         }
 
         template <int N>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename add_reference<
             typename add_const<
                 typename mpl::at_c<types, N>::type
@@ -208,7 +219,7 @@ FUSION_HASH endif
         }
 
         template <typename I>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename add_reference<
             typename mpl::at<types, I>::type
         >::type
@@ -218,7 +229,7 @@ FUSION_HASH endif
         }
 
         template<typename I>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         typename add_reference<
             typename add_const<
                 typename mpl::at<types, I>::type
diff --git a/include/boost/fusion/container/vector/vector10.hpp b/include/boost/fusion/container/vector/vector10.hpp
index 2e24f028..a5ef4754 100644
--- a/include/boost/fusion/container/vector/vector10.hpp
+++ b/include/boost/fusion/container/vector/vector10.hpp
@@ -52,12 +52,12 @@ namespace boost { namespace fusion
         typedef random_access_traversal_tag category;
         typedef mpl::int_<0> size;
 
-        BOOST_FUSION_GPU_ENABLED
-        vector0() {}
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        vector0() BOOST_NOEXCEPT {}
 
         template<typename Sequence>
-        BOOST_FUSION_GPU_ENABLED
-        vector0(Sequence const& /*seq*/)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        vector0(Sequence const& /*seq*/) BOOST_NOEXCEPT
         {}
     };
 }}
diff --git a/include/boost/fusion/container/vector/vector_iterator.hpp b/include/boost/fusion/container/vector/vector_iterator.hpp
index ffa4d138..a53a8ca7 100644
--- a/include/boost/fusion/container/vector/vector_iterator.hpp
+++ b/include/boost/fusion/container/vector/vector_iterator.hpp
@@ -37,9 +37,10 @@ namespace boost { namespace fusion
         typedef vector_iterator_identity<
             typename add_const<Vector>::type, N> identity;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         vector_iterator(Vector& in_vec)
             : vec(in_vec) {}
+
         Vector& vec;
 
     private:
diff --git a/include/boost/fusion/functional/adapter/fused.hpp b/include/boost/fusion/functional/adapter/fused.hpp
index c6b1b03c..c27d0acc 100644
--- a/include/boost/fusion/functional/adapter/fused.hpp
+++ b/include/boost/fusion/functional/adapter/fused.hpp
@@ -37,13 +37,13 @@ namespace boost { namespace fusion
 
     public:
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline explicit fused(func_const_fwd_t f = Function())
             : fnc_transformed(f)
         { }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke<func_const_fwd_t,Seq const>::type 
         operator()(Seq const & s) const
         {
@@ -51,7 +51,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke<func_fwd_t,Seq const>::type 
         operator()(Seq const & s) 
         {
@@ -59,7 +59,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke<func_const_fwd_t,Seq>::type 
         operator()(Seq & s) const
         {
@@ -67,7 +67,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke<func_fwd_t,Seq>::type 
         operator()(Seq & s) 
         {
diff --git a/include/boost/fusion/functional/adapter/fused_function_object.hpp b/include/boost/fusion/functional/adapter/fused_function_object.hpp
index b3973a11..cdb9c24b 100644
--- a/include/boost/fusion/functional/adapter/fused_function_object.hpp
+++ b/include/boost/fusion/functional/adapter/fused_function_object.hpp
@@ -37,13 +37,13 @@ namespace boost { namespace fusion
 
     public:
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline explicit fused_function_object(func_const_fwd_t f = Function())
             : fnc_transformed(f)
         { }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke_function_object<func_const_fwd_t,
             Seq const>::type operator()(Seq const & s) const
         {
@@ -52,7 +52,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke_function_object<func_fwd_t,
             Seq const>::type 
         operator()(Seq const & s) 
@@ -62,7 +62,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke_function_object<func_const_fwd_t,
             Seq>::type
         operator()(Seq & s) const
@@ -72,7 +72,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename result_of::invoke_function_object<func_fwd_t,Seq>::type
         operator()(Seq & s) 
         {
diff --git a/include/boost/fusion/functional/adapter/fused_procedure.hpp b/include/boost/fusion/functional/adapter/fused_procedure.hpp
index 495320af..79be2176 100644
--- a/include/boost/fusion/functional/adapter/fused_procedure.hpp
+++ b/include/boost/fusion/functional/adapter/fused_procedure.hpp
@@ -37,13 +37,13 @@ namespace boost { namespace fusion
 
     public:
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline explicit fused_procedure(func_const_fwd_t f = Function())
             : fnc_transformed(f)
         { }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline void operator()(Seq const & s) const
         {
             fusion::invoke_procedure<
@@ -51,7 +51,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline void operator()(Seq const & s) 
         {
             fusion::invoke_procedure<
@@ -59,7 +59,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline void operator()(Seq & s) const
         {
             fusion::invoke_procedure<
@@ -67,7 +67,7 @@ namespace boost { namespace fusion
         }
 
         template <class Seq> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline void operator()(Seq & s) 
         {
             return fusion::invoke_procedure<
diff --git a/include/boost/fusion/functional/adapter/unfused.hpp b/include/boost/fusion/functional/adapter/unfused.hpp
index b02f5d28..9d85869d 100644
--- a/include/boost/fusion/functional/adapter/unfused.hpp
+++ b/include/boost/fusion/functional/adapter/unfused.hpp
@@ -47,14 +47,16 @@ namespace boost { namespace fusion
 
         using unfused<Function,false>::operator();
 
-        BOOST_FUSION_GPU_ENABLED inline explicit unfused(func_const_fwd_t f = function())
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        inline explicit unfused(func_const_fwd_t f = function())
             : unfused<Function,false>(f)
         { }
 
         typedef typename boost::result_of<
             function_c(fusion::vector0<> &) >::type call_const_0_result;
 
-        BOOST_FUSION_GPU_ENABLED inline call_const_0_result operator()() const
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        inline call_const_0_result operator()() const
         {
             fusion::vector0<> arg;
             return this->fnc_transformed(arg);
@@ -63,7 +65,8 @@ namespace boost { namespace fusion
         typedef typename boost::result_of< 
             function(fusion::vector0<> &) >::type call_0_result;
 
-        BOOST_FUSION_GPU_ENABLED inline call_0_result operator()() 
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        inline call_0_result operator()()
         {
             fusion::vector0<> arg;
             return this->fnc_transformed(arg);
@@ -79,7 +82,7 @@ namespace boost { namespace fusion
         typedef typename detail::call_param<Function>::type func_const_fwd_t;
       public:
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline explicit unfused(func_const_fwd_t f = function())
             : fnc_transformed(f)
         { }
@@ -149,7 +152,7 @@ namespace boost
         { };
 
         template <BOOST_PP_ENUM_PARAMS(N,typename T)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename boost::result_of<function_c(BOOST_PP_CAT(fusion::vector,N)
             <BOOST_PP_ENUM_BINARY_PARAMS(N,T,& BOOST_PP_INTERCEPT)> & )>::type
         operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,& a)) const
@@ -161,7 +164,7 @@ namespace boost
         }
 
         template <BOOST_PP_ENUM_PARAMS(N,typename T)>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename boost::result_of<function(BOOST_PP_CAT(fusion::vector,N)
             <BOOST_PP_ENUM_BINARY_PARAMS(N,T,& BOOST_PP_INTERCEPT)> & )>::type
         operator()(BOOST_PP_ENUM_BINARY_PARAMS(N,T,& a)) 
diff --git a/include/boost/fusion/functional/adapter/unfused_typed.hpp b/include/boost/fusion/functional/adapter/unfused_typed.hpp
index c3ab33dd..23faf153 100644
--- a/include/boost/fusion/functional/adapter/unfused_typed.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_typed.hpp
@@ -63,7 +63,7 @@ namespace boost { namespace fusion
 
     public:
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline explicit unfused_typed(func_const_fwd_t f = Function())
             : fnc_transformed(f)
         { }
@@ -130,7 +130,7 @@ namespace boost
 #define M(z,i,s)                                                                \
     typename call_param<typename result_of::value_at_c<s,i>::type>::type a##i
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             inline typename boost::result_of<
                 function_c(arg_vector_t &) >::type
             operator()(BOOST_PP_ENUM(N,M,arg_vector_t)) const
@@ -143,7 +143,7 @@ namespace boost
                 return static_cast<Derived const *>(this)->fnc_transformed(arg);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             inline typename boost::result_of<
                 function(arg_vector_t &) >::type 
             operator()(BOOST_PP_ENUM(N,M,arg_vector_t)) 
diff --git a/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp b/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
index b7744826..2548a086 100644
--- a/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
+++ b/include/boost/fusion/functional/generation/detail/gen_make_adapter.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
     }
 
     template <typename F>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::BOOST_FUSION_FUNC_NAME<F>::type
     BOOST_FUSION_FUNC_NAME(F const & f)
     {
diff --git a/include/boost/fusion/functional/invocation/detail/that_ptr.hpp b/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
index a2b4a86a..7a1a5c57 100644
--- a/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
+++ b/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
@@ -25,13 +25,13 @@ namespace boost { namespace fusion { namespace detail
         typedef typename remove_reference<Wanted>::type pointee;
 
         template <typename T> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline pointee * do_get_pointer(T &, pointee * x) 
         {
             return x;
         }
         template <typename T> 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline pointee * do_get_pointer(T & x, void const *) 
         {
             return get_pointer(x); 
@@ -39,20 +39,20 @@ namespace boost { namespace fusion { namespace detail
 
       public:
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline pointee * get(pointee * x)
         {
             return x; 
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline pointee * get(pointee & x)
         {
             return boost::addressof(x); 
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline pointee * get(T & x)
         {
             return do_get_pointer(x, boost::addressof(x)); 
diff --git a/include/boost/fusion/functional/invocation/invoke.hpp b/include/boost/fusion/functional/invocation/invoke.hpp
index 2de4fced..e1373542 100644
--- a/include/boost/fusion/functional/invocation/invoke.hpp
+++ b/include/boost/fusion/functional/invocation/invoke.hpp
@@ -150,7 +150,7 @@ namespace boost { namespace fusion
             typedef typename boost::add_reference<qualified_type>::type
                 result_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type call(T C::* f, Sequence & s)
             {
                 typename result_of::front<Sequence>::type c = fusion::front(s);
@@ -173,7 +173,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::invoke<Function,Sequence>::type
     invoke(Function f, Sequence & s)
     {
@@ -183,7 +183,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::invoke<Function,Sequence const>::type
     invoke(Function f, Sequence const & s)
     {
@@ -220,7 +220,7 @@ namespace boost { namespace fusion
 #if N > 0
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -230,7 +230,7 @@ namespace boost { namespace fusion
 
 #else
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & /*s*/)
             {
@@ -251,7 +251,7 @@ namespace boost { namespace fusion
 #if N > 0
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -261,7 +261,7 @@ namespace boost { namespace fusion
 
 #else
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & /*s*/)
             {
@@ -282,7 +282,7 @@ namespace boost { namespace fusion
             typedef typename ft::result_type<Function>::type result_type;
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -318,7 +318,7 @@ namespace boost { namespace fusion
 #if N > 0
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -330,7 +330,7 @@ namespace boost { namespace fusion
 #else
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & /*s*/)
             {
@@ -353,7 +353,7 @@ namespace boost { namespace fusion
 #if N > 0
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -365,7 +365,7 @@ namespace boost { namespace fusion
 #else
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & /*s*/)
             {
@@ -387,7 +387,7 @@ namespace boost { namespace fusion
             typedef typename ft::result_type<Function>::type result_type;
 
             template <typename F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
diff --git a/include/boost/fusion/functional/invocation/invoke_function_object.hpp b/include/boost/fusion/functional/invocation/invoke_function_object.hpp
index a5c9510c..6d414f55 100644
--- a/include/boost/fusion/functional/invocation/invoke_function_object.hpp
+++ b/include/boost/fusion/functional/invocation/invoke_function_object.hpp
@@ -40,12 +40,12 @@ namespace boost { namespace fusion
     }
 
     template <class Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::invoke_function_object<Function, Sequence>::type
     invoke_function_object(Function, Sequence &);
 
     template <class Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::invoke_function_object<Function, Sequence const
         >::type invoke_function_object(Function, Sequence const &);
 
@@ -81,7 +81,7 @@ namespace boost { namespace fusion
     }
 
     template <class Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::invoke_function_object<Function,Sequence>::type
     invoke_function_object(Function f, Sequence & s)
     {
@@ -91,7 +91,7 @@ namespace boost { namespace fusion
     }
 
     template <class Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::invoke_function_object<Function,Sequence const>::type
     invoke_function_object(Function f, Sequence const & s)
     {
@@ -125,7 +125,7 @@ namespace boost { namespace fusion
 #if N > 0
 
             template <class F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -137,7 +137,7 @@ namespace boost { namespace fusion
 #else
 
             template <class F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & /*s*/)
             {
@@ -161,7 +161,7 @@ namespace boost { namespace fusion
 #if N > 0
 
             template <class F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & s)
             {
@@ -177,7 +177,7 @@ namespace boost { namespace fusion
 #else
 
             template <class F>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline result_type
             call(F & f, Sequence & /*s*/)
             {
diff --git a/include/boost/fusion/functional/invocation/invoke_procedure.hpp b/include/boost/fusion/functional/invocation/invoke_procedure.hpp
index bd3e49b9..028e0fe3 100644
--- a/include/boost/fusion/functional/invocation/invoke_procedure.hpp
+++ b/include/boost/fusion/functional/invocation/invoke_procedure.hpp
@@ -47,11 +47,11 @@ namespace boost { namespace fusion
     }
 
     template <typename Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void invoke_procedure(Function, Sequence &);
 
     template <typename Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void invoke_procedure(Function, Sequence const &);
 
     //----- ---- --- -- - -  -   -
@@ -77,7 +77,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void invoke_procedure(Function f, Sequence & s)
     {
         detail::invoke_procedure_impl<
@@ -86,7 +86,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Function, class Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline void invoke_procedure(Function f, Sequence const & s)
     {
         detail::invoke_procedure_impl<
@@ -113,7 +113,7 @@ namespace boost { namespace fusion
 
 #if N > 0
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline void call(Function & f, Sequence & s)
             {
                 f(BOOST_PP_ENUM(N,M,~));
@@ -121,7 +121,7 @@ namespace boost { namespace fusion
 
 #else
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline void call(Function & f, Sequence & /*s*/)
             {
                 f();
@@ -135,7 +135,7 @@ namespace boost { namespace fusion
         template <typename Function, class Sequence>
         struct invoke_procedure_impl<Function,Sequence,N,true,true>
         {
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline void call(Function & f, Sequence & s)
             {
                 (that_ptr<typename mpl::front<
@@ -158,7 +158,7 @@ namespace boost { namespace fusion
 
 #if N > 0
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline void call(Function & f, Sequence & s)
             {
                 typedef typename result_of::begin<Sequence>::type I0;
@@ -168,7 +168,7 @@ namespace boost { namespace fusion
             }
 
 #else
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline void call(Function & f, Sequence & /*s*/)
             {
                 f();
@@ -182,7 +182,7 @@ namespace boost { namespace fusion
         template <typename Function, class Sequence>
         struct invoke_procedure_impl<Function,Sequence,N,true,false>
         {
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline void call(Function & f, Sequence & s)
             {
                 typedef typename result_of::begin<Sequence>::type I0;
diff --git a/include/boost/fusion/sequence/comparison/detail/equal_to.hpp b/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
index 577023db..cffed6c3 100644
--- a/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::end<Seq2>::type end2_type;
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const&, I2 const&, mpl::true_)
         {
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b, mpl::false_)
         {
@@ -41,7 +41,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
@@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail
     struct sequence_equal_to<Seq1, Seq2, false>
     {
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& /*a*/, I2 const& /*b*/)
         {
diff --git a/include/boost/fusion/sequence/comparison/detail/greater.hpp b/include/boost/fusion/sequence/comparison/detail/greater.hpp
index d875f16b..d7626529 100644
--- a/include/boost/fusion/sequence/comparison/detail/greater.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/greater.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::end<Seq2>::type end2_type;
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const&, I2 const&, mpl::true_)
         {
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b, mpl::false_)
         {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
diff --git a/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp b/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
index e0aa530e..d15d88c4 100644
--- a/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::end<Seq2>::type end2_type;
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const&, I2 const&, mpl::true_)
         {
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b, mpl::false_)
         {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
diff --git a/include/boost/fusion/sequence/comparison/detail/less.hpp b/include/boost/fusion/sequence/comparison/detail/less.hpp
index 8964ca7d..04377d69 100644
--- a/include/boost/fusion/sequence/comparison/detail/less.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/less.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::end<Seq2>::type end2_type;
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const&, I2 const&, mpl::true_)
         {
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b, mpl::false_)
         {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
diff --git a/include/boost/fusion/sequence/comparison/detail/less_equal.hpp b/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
index 10bcb767..e61d33c4 100644
--- a/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::end<Seq2>::type end2_type;
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const&, I2 const&, mpl::true_)
         {
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b, mpl::false_)
         {
@@ -42,7 +42,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
diff --git a/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp b/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
index b230ac1f..323b2ac9 100644
--- a/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace fusion { namespace detail
         typedef typename result_of::end<Seq2>::type end2_type;
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const&, I2 const&, mpl::true_)
         {
@@ -32,7 +32,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b, mpl::false_)
         {
@@ -41,7 +41,7 @@ namespace boost { namespace fusion { namespace detail
         }
 
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
@@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail
     struct sequence_not_equal_to<Seq1, Seq2, false>
     {
         template <typename I1, typename I2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static bool
         call(I1 const& a, I2 const& b)
         {
diff --git a/include/boost/fusion/sequence/comparison/equal_to.hpp b/include/boost/fusion/sequence/comparison/equal_to.hpp
index 485df0ba..283ffefc 100644
--- a/include/boost/fusion/sequence/comparison/equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/equal_to.hpp
@@ -24,7 +24,7 @@
 namespace boost { namespace fusion
 {
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     equal_to(Seq1 const& a, Seq2 const& b)
     {
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     namespace operators
     {
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename
             boost::enable_if<
                 traits::enable_equality<Seq1, Seq2>
diff --git a/include/boost/fusion/sequence/comparison/greater.hpp b/include/boost/fusion/sequence/comparison/greater.hpp
index 5ad7ef74..fbbb7bfa 100644
--- a/include/boost/fusion/sequence/comparison/greater.hpp
+++ b/include/boost/fusion/sequence/comparison/greater.hpp
@@ -23,7 +23,7 @@
 namespace boost { namespace fusion
 {
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     greater(Seq1 const& a, Seq2 const& b)
     {
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     namespace operators
     {
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename
             boost::enable_if<
                 traits::enable_comparison<Seq1, Seq2>
diff --git a/include/boost/fusion/sequence/comparison/greater_equal.hpp b/include/boost/fusion/sequence/comparison/greater_equal.hpp
index 65904f83..7b91a888 100644
--- a/include/boost/fusion/sequence/comparison/greater_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/greater_equal.hpp
@@ -23,7 +23,7 @@
 namespace boost { namespace fusion
 {
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     greater_equal(Seq1 const& a, Seq2 const& b)
     {
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
     namespace operators
     {
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename
             boost::enable_if<
                 traits::enable_comparison<Seq1, Seq2>
diff --git a/include/boost/fusion/sequence/comparison/less.hpp b/include/boost/fusion/sequence/comparison/less.hpp
index 28762b73..b056552a 100644
--- a/include/boost/fusion/sequence/comparison/less.hpp
+++ b/include/boost/fusion/sequence/comparison/less.hpp
@@ -18,7 +18,7 @@
 namespace boost { namespace fusion
 {
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     less(Seq1 const& a, Seq2 const& b)
     {
@@ -29,7 +29,7 @@ namespace boost { namespace fusion
     namespace operators
     {
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename
             boost::enable_if<
                 traits::enable_comparison<Seq1, Seq2>
diff --git a/include/boost/fusion/sequence/comparison/less_equal.hpp b/include/boost/fusion/sequence/comparison/less_equal.hpp
index d0668208..53159926 100644
--- a/include/boost/fusion/sequence/comparison/less_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/less_equal.hpp
@@ -24,7 +24,7 @@
 namespace boost { namespace fusion
 {
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     less_equal(Seq1 const& a, Seq2 const& b)
     {
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
 #if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
 // Workaround for  VC8.0 and VC7.1
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline bool
         operator<=(sequence_base<Seq1> const& a, sequence_base<Seq2> const& b)
         {
@@ -49,7 +49,7 @@ namespace boost { namespace fusion
         }
 
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename disable_if<traits::is_native_fusion_sequence<Seq2>, bool>::type
         operator<=(sequence_base<Seq1> const& a, Seq2 const& b)
         {
@@ -57,7 +57,7 @@ namespace boost { namespace fusion
         }
 
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename disable_if<traits::is_native_fusion_sequence<Seq1>, bool>::type
         operator<=(Seq1 const& a, sequence_base<Seq2> const& b)
         {
@@ -69,7 +69,7 @@ namespace boost { namespace fusion
 // but barfs somewhere else.
 
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename
             boost::enable_if<
                 traits::enable_comparison<Seq1, Seq2>
diff --git a/include/boost/fusion/sequence/comparison/not_equal_to.hpp b/include/boost/fusion/sequence/comparison/not_equal_to.hpp
index 4cd94f9e..fc2fef33 100644
--- a/include/boost/fusion/sequence/comparison/not_equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/not_equal_to.hpp
@@ -23,7 +23,7 @@
 namespace boost { namespace fusion
 {
     template <typename Seq1, typename Seq2>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     not_equal_to(Seq1 const& a, Seq2 const& b)
     {
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
     namespace operators
     {
         template <typename Seq1, typename Seq2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         inline typename
             boost::enable_if<
                 traits::enable_equality<Seq1, Seq2>
diff --git a/include/boost/fusion/sequence/convert.hpp b/include/boost/fusion/sequence/convert.hpp
index 461b9212..b367714c 100644
--- a/include/boost/fusion/sequence/convert.hpp
+++ b/include/boost/fusion/sequence/convert.hpp
@@ -7,6 +7,8 @@
 #if !defined(FUSION_CONVERT_10022005_1442)
 #define FUSION_CONVERT_10022005_1442
 
+#include <boost/fusion/support/config.hpp>
+
 namespace boost { namespace fusion
 {
     namespace extension
@@ -29,7 +31,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Tag, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::convert<Tag, Sequence>::type
     convert(Sequence& seq)
     {
@@ -38,7 +40,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Tag, typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::convert<Tag, Sequence const>::type
     convert(Sequence const& seq)
     {
diff --git a/include/boost/fusion/support/as_const.hpp b/include/boost/fusion/support/as_const.hpp
index ed535970..04d5bfcc 100644
--- a/include/boost/fusion/support/as_const.hpp
+++ b/include/boost/fusion/support/as_const.hpp
@@ -7,6 +7,9 @@
 #ifndef BOOST_FUSION_SUPPORT_AS_CONST_HPP
 #define BOOST_FUSION_SUPPORT_AS_CONST_HPP
 
+#include <boost/config.hpp>
+#include <boost/fusion/support/config.hpp>
+
 namespace boost { namespace fusion { namespace extension
 {
     // A customization point that allows certain wrappers around
@@ -16,8 +19,8 @@ namespace boost { namespace fusion { namespace extension
     // such contexts with calls to this function. Users can
     // specialize this function for their own wrappers.
     template <typename T>
-    BOOST_FUSION_GPU_ENABLED
-    const T& as_const(const T& obj)
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline const T& as_const(const T& obj) BOOST_NOEXCEPT
     {
         return obj;
     }
diff --git a/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp b/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
index 514e8d95..6a388bf8 100644
--- a/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
+++ b/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
@@ -66,8 +66,8 @@ namespace boost { namespace fusion
     }
 
     template <typename Cur, typename Context>
-    BOOST_FUSION_GPU_ENABLED
-    typename result_of::make_segmented_iterator<Cur, Context>::type
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+    inline typename result_of::make_segmented_iterator<Cur, Context>::type
     make_segmented_iterator(Cur const& cur, Context const& context)
     {
         typedef result_of::make_segmented_iterator<Cur, Context> impl_type;
@@ -121,7 +121,7 @@ namespace boost { namespace fusion
             typedef iterator_range<Cur, End>    range_type;
             typedef cons<range_type, Context>   type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Cur const& cur, End const& end, Context const& context)
             {
                 return cons<range_type, Context>(range_type(cur, end), context);
@@ -170,7 +170,7 @@ namespace boost { namespace fusion
             typedef typename impl::type type;
             typedef typename impl::continue_type continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq, State const& state, Context const& context, Fun const& fun)
             {
                 return impl::call(fusion::segments(seq), state, context, fun);
@@ -192,7 +192,7 @@ namespace boost { namespace fusion
             typedef typename apply_type::type type;
             typedef typename apply_type::continue_type continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Sequence& seq, State const& state, Context const& context, Fun const& fun)
             {
                 return apply_type::call(seq, state, context, fun);
@@ -274,14 +274,14 @@ namespace boost { namespace fusion
                 >::type
             continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Begin const& beg, End const& end, State const& state
                            , Context const& context, Fun const& fun)
             {
                 return call(beg, end, state, context, fun, typename fold_recurse_impl::continue_type());
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Begin const& beg, End const& end, State const& state
                            , Context const& context, Fun const& fun, mpl::true_) // continue
             {
@@ -297,7 +297,7 @@ namespace boost { namespace fusion
                   , fun);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Begin const& beg, End const& end, State const& state
                            , Context const& context, Fun const& fun, mpl::false_) // break
             {
@@ -325,7 +325,7 @@ namespace boost { namespace fusion
             typedef typename impl::type type;
             typedef typename impl::continue_type continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Begin const& beg, End const& end, State const& state
                            , Context const& context, Fun const& fun)
             {
@@ -351,7 +351,7 @@ namespace boost { namespace fusion
             typedef typename impl::type type;
             typedef typename impl::continue_type continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Begin const& beg, End const& end, State const& state
                            , Context const& context, Fun const& fun)
             {
@@ -365,7 +365,7 @@ namespace boost { namespace fusion
             typedef State type;
             typedef mpl::true_ continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Begin const&, End const&, State const& state
                            , Context const&, Fun const&)
             {
@@ -389,7 +389,7 @@ namespace boost { namespace fusion
             typedef typename impl::type type;
             typedef typename impl::continue_type continue_type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type call(Segments& segs, State const& state, Context const& context, Fun const& fun)
             {
                 return impl::call(fusion::begin(segs), fusion::end(segs), state, context, fun);
diff --git a/include/boost/fusion/support/iterator_base.hpp b/include/boost/fusion/support/iterator_base.hpp
index d23d05c6..5d8ce3ab 100644
--- a/include/boost/fusion/support/iterator_base.hpp
+++ b/include/boost/fusion/support/iterator_base.hpp
@@ -7,6 +7,7 @@
 #if !defined(FUSION_ITERATOR_BASE_05042005_1008)
 #define FUSION_ITERATOR_BASE_05042005_1008
 
+#include <boost/config.hpp>
 #include <boost/fusion/support/config.hpp>
 
 namespace boost { namespace fusion
@@ -16,16 +17,16 @@ namespace boost { namespace fusion
     template <typename Iterator>
     struct iterator_base : iterator_root
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         Iterator const&
-        cast() const
+        cast() const BOOST_NOEXCEPT
         {
             return static_cast<Iterator const&>(*this);
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         Iterator&
-        cast()
+        cast() BOOST_NOEXCEPT
         {
             return static_cast<Iterator&>(*this);
         }
diff --git a/include/boost/fusion/support/pair.hpp b/include/boost/fusion/support/pair.hpp
index b09c7b4b..fd5d57e6 100644
--- a/include/boost/fusion/support/pair.hpp
+++ b/include/boost/fusion/support/pair.hpp
@@ -29,51 +29,47 @@ namespace boost { namespace fusion
     template <typename First, typename Second>
     struct pair
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair()
             : second() {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair(pair const& rhs)
             : second(rhs.second) {}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair(pair&& rhs)
             : second(BOOST_FUSION_FWD_ELEM(Second, rhs.second)) {}
-
 #endif
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair(typename detail::call_param<Second>::type val)
             : second(val) {}
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
-        BOOST_FUSION_GPU_ENABLED
         template <typename Second2>
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair(Second2&& val
           , typename boost::disable_if<is_lvalue_reference<Second2> >::type* /* dummy */ = 0
           , typename boost::enable_if<is_convertible<Second2, Second> >::type* /*dummy*/ = 0
         ) : second(BOOST_FUSION_FWD_ELEM(Second, val)) {}
-
 #endif
 
         template <typename Second2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair(pair<First, Second2> const& rhs)
             : second(rhs.second) {}
 
         template <typename Second2>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair& operator=(pair<First, Second2> const& rhs)
         {
             second = rhs.second;
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair& operator=(pair const& rhs)
         {
             second = rhs.second;
@@ -81,7 +77,7 @@ namespace boost { namespace fusion
         }
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         pair& operator=(pair&& rhs)
         {
             second = BOOST_FUSION_FWD_ELEM(Second, rhs.second);
@@ -117,7 +113,7 @@ namespace boost { namespace fusion
     }
 
     template <typename First, typename Second>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::make_pair<First,Second>::type
     make_pair(Second const& val)
     {
@@ -141,7 +137,7 @@ namespace boost { namespace fusion
     }
 
     template <typename First, typename SecondL, typename SecondR>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     operator==(pair<First, SecondL> const& l, pair<First, SecondR> const& r)
     {
@@ -149,7 +145,7 @@ namespace boost { namespace fusion
     }
 
     template <typename First, typename SecondL, typename SecondR>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     operator!=(pair<First, SecondL> const& l, pair<First, SecondR> const& r)
     {
@@ -157,7 +153,7 @@ namespace boost { namespace fusion
     }
 
     template <typename First, typename SecondL, typename SecondR>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline bool
     operator<(pair<First, SecondL> const& l, pair<First, SecondR> const& r)
     {
diff --git a/include/boost/fusion/support/segmented_fold_until.hpp b/include/boost/fusion/support/segmented_fold_until.hpp
index cf01fea4..9e6f4a50 100644
--- a/include/boost/fusion/support/segmented_fold_until.hpp
+++ b/include/boost/fusion/support/segmented_fold_until.hpp
@@ -45,7 +45,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename State, typename Fun>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename
         lazy_disable_if<
             is_const<Sequence>
@@ -56,19 +56,19 @@ namespace boost { namespace fusion
         typedef
             typename result_of::segmented_fold_until<Sequence, State, Fun>::filter
         filter;
-        
+
         return filter::call(seq, state, fusion::nil_(), fun);
     }
 
     template <typename Sequence, typename State, typename Fun>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename result_of::segmented_fold_until<Sequence const, State, Fun>::type
     segmented_fold_until(Sequence const& seq, State const& state, Fun const& fun)
     {
         typedef
             typename result_of::segmented_fold_until<Sequence const, State, Fun>::filter
         filter;
-        
+
         return filter::call(seq, state, fusion::nil_(), fun);
     }
 }}
diff --git a/include/boost/fusion/support/sequence_base.hpp b/include/boost/fusion/support/sequence_base.hpp
index b59121c0..2f9320e6 100644
--- a/include/boost/fusion/support/sequence_base.hpp
+++ b/include/boost/fusion/support/sequence_base.hpp
@@ -8,6 +8,7 @@
 #if !defined(FUSION_SEQUENCE_BASE_04182005_0737)
 #define FUSION_SEQUENCE_BASE_04182005_0737
 
+#include <boost/config.hpp>
 #include <boost/fusion/support/config.hpp>
 #include <boost/mpl/begin_end_fwd.hpp>
 
@@ -22,22 +23,22 @@ namespace boost { namespace fusion
     template <typename Sequence>
     struct sequence_base
     {
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         Sequence const&
-        derived() const
+        derived() const BOOST_NOEXCEPT
         {
             return static_cast<Sequence const&>(*this);
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         Sequence&
-        derived()
+        derived() BOOST_NOEXCEPT
         {
             return static_cast<Sequence&>(*this);
         }
 
-        BOOST_FUSION_GPU_ENABLED
-        operator detail::from_sequence_convertible_type()const
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        operator detail::from_sequence_convertible_type() const BOOST_NOEXCEPT
         {
             return detail::from_sequence_convertible_type();
         }
diff --git a/include/boost/fusion/support/unused.hpp b/include/boost/fusion/support/unused.hpp
index b3eec5ce..4bbe24e8 100644
--- a/include/boost/fusion/support/unused.hpp
+++ b/include/boost/fusion/support/unused.hpp
@@ -22,65 +22,67 @@ namespace boost { namespace fusion
 {
     struct unused_type
     {
-        BOOST_FUSION_GPU_ENABLED
-        unused_type()
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        unused_type() BOOST_NOEXCEPT
         {
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
-        unused_type(T const&)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        unused_type(T const&) BOOST_NOEXCEPT
         {
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         unused_type const&
-        operator=(T const&) const
+        operator=(T const&) const BOOST_NOEXCEPT
         {
             return *this;
         }
 
         template <typename T>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         unused_type&
-        operator=(T const&)
+        operator=(T const&) BOOST_NOEXCEPT
         {
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         unused_type const&
-        operator=(unused_type const&) const
+        operator=(unused_type const&) const BOOST_NOEXCEPT
         {
             return *this;
         }
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         unused_type&
-        operator=(unused_type const&)
+        operator=(unused_type const&) BOOST_NOEXCEPT
         {
             return *this;
         }
     };
 
-    unused_type const unused = unused_type();
+    BOOST_CONSTEXPR unused_type const unused = unused_type();
 
     namespace detail
     {
         struct unused_only
         {
-            BOOST_FUSION_GPU_ENABLED
-            unused_only(unused_type const&) {}
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+            unused_only(unused_type const&) BOOST_NOEXCEPT {}
         };
     }
 
-    inline std::ostream& operator<<(std::ostream& out, detail::unused_only const&)
+    BOOST_CONSTEXPR
+    inline std::ostream& operator<<(std::ostream& out, detail::unused_only const&) BOOST_NOEXCEPT
     {
         return out;
     }
 
-    inline std::istream& operator>>(std::istream& in, unused_type&)
+    BOOST_CONSTEXPR
+    inline std::istream& operator>>(std::istream& in, unused_type&) BOOST_NOEXCEPT
     {
         return in;
     }
diff --git a/include/boost/fusion/view/detail/strictest_traversal.hpp b/include/boost/fusion/view/detail/strictest_traversal.hpp
index 4092ea4d..9ad1f7aa 100644
--- a/include/boost/fusion/view/detail/strictest_traversal.hpp
+++ b/include/boost/fusion/view/detail/strictest_traversal.hpp
@@ -59,7 +59,7 @@ namespace boost { namespace fusion
             // never called, but needed for decltype-based result_of (C++0x)
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
             template<typename StrictestSoFar, typename Next>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<strictest_traversal_impl(StrictestSoFar, Next)>::type
             operator()(StrictestSoFar&&, Next&&) const;
 #endif
diff --git a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
index 89f67d02..3ce439a4 100644
--- a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::category category;
                 typedef filter_iterator<category, first_type, last_type, pred_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
index ba8631f5..e0d9a0ed 100644
--- a/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/deref_data_impl.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace fusion { namespace extension
                 result_of::deref_data<typename It::first_type>::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/view/filter_view/detail/end_impl.hpp b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
index fee9f6d4..1a2a5ba4 100644
--- a/include/boost/fusion/view/filter_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::category category;
                 typedef filter_iterator<category,last_type, last_type, pred_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/filter_view/detail/next_impl.hpp b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
index 0091e897..4f174557 100644
--- a/include/boost/fusion/view/filter_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
@@ -63,7 +63,7 @@ namespace boost { namespace fusion
                     category, typename filter::type, last_type, pred_type>
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/filter_view/filter_view.hpp b/include/boost/fusion/view/filter_view/filter_view.hpp
index dd710fab..db61cad6 100644
--- a/include/boost/fusion/view/filter_view/filter_view.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view.hpp
@@ -46,14 +46,14 @@ namespace boost { namespace fusion
         typedef typename result_of::end<Sequence>::type last_type;
         typedef Pred pred_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         filter_view(Sequence& in_seq)
             : seq(in_seq)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first_type first() const { return fusion::begin(seq); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
 
diff --git a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
index 14aaa460..1a4197c5 100644
--- a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
@@ -55,7 +55,7 @@ namespace boost { namespace fusion
         typedef last_iter last_type;
         typedef Pred pred_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         filter_iterator(First const& in_first)
             : first(filter::iter_call(first_converter::call(in_first))) {}
 
diff --git a/include/boost/fusion/view/flatten_view/flatten_view.hpp b/include/boost/fusion/view/flatten_view/flatten_view.hpp
index aa472407..8e40158d 100644
--- a/include/boost/fusion/view/flatten_view/flatten_view.hpp
+++ b/include/boost/fusion/view/flatten_view/flatten_view.hpp
@@ -8,6 +8,7 @@
 #define BOOST_FUSION_FLATTEN_VIEW_HPP_INCLUDED
 
 
+#include <boost/fusion/support/config.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/single_view.hpp>
 #include <boost/fusion/support/detail/access.hpp>
@@ -23,7 +24,7 @@ namespace boost { namespace fusion
 {
     struct forward_traversal_tag;
     struct flatten_view_tag;
-    
+
     template <typename Sequence>
     struct flatten_view
       : sequence_base<flatten_view<Sequence> >
@@ -32,18 +33,21 @@ namespace boost { namespace fusion
         typedef fusion_sequence_tag tag; // this gets picked up by MPL
         typedef mpl::true_ is_view;
         typedef forward_traversal_tag category;
-        
+
         typedef Sequence sequence_type;
         typedef typename result_of::begin<Sequence>::type first_type;
         typedef typename result_of::end<Sequence>::type last_type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         explicit flatten_view(Sequence& seq)
           : seq(seq)
         {}
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first_type first() const { return fusion::begin(seq); }
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last_type last() const { return fusion::end(seq); }
-        
+
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
     };
 }}
@@ -57,19 +61,20 @@ namespace boost { namespace fusion { namespace extension
         struct apply
         {
             typedef typename Sequence::first_type first_type;
-            
+
             typedef typename
                     result_of::begin<
                         mpl::single_view<
                             typename Sequence::sequence_type> >::type
             root_iterator;
-            
+
             typedef
                 detail::seek_descent<root_iterator, first_type>
             seek_descent;
-            
+
             typedef typename seek_descent::type type;
 
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline
             type call(Sequence& seq)
             {
@@ -77,7 +82,7 @@ namespace boost { namespace fusion { namespace extension
             }
         };
     };
-    
+
     template<>
     struct end_impl<flatten_view_tag>
     {
@@ -85,13 +90,14 @@ namespace boost { namespace fusion { namespace extension
         struct apply
         {
             typedef typename Sequence::last_type last_type;
-            
+
             typedef typename
                     result_of::end<
                         mpl::single_view<
                             typename Sequence::sequence_type> >::type
             type;
 
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline
             type call(Sequence&)
             {
diff --git a/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp b/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp
index dfe613ac..f82a5266 100644
--- a/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp
+++ b/include/boost/fusion/view/flatten_view/flatten_view_iterator.hpp
@@ -8,6 +8,7 @@
 #define BOOST_FUSION_FLATTEN_VIEW_ITERATOR_HPP_INCLUDED
 
 
+#include <boost/fusion/support/config.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/type_traits/remove_reference.hpp>
@@ -23,22 +24,23 @@ namespace boost { namespace fusion
 {
     struct forward_traversal_tag;
     struct flatten_view_iterator_tag;
-    
+
     template<class First, class Base>
     struct flatten_view_iterator
       : iterator_base<flatten_view_iterator<First, Base> >
     {
         typedef flatten_view_iterator_tag fusion_tag;
         typedef forward_traversal_tag category;
-        
+
         typedef convert_iterator<First> first_converter;
         typedef typename first_converter::type first_type;
         typedef Base base_type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         flatten_view_iterator(First const& first, Base const& base)
           : first(first), base(base)
         {}
-        
+
         first_type first;
         base_type base;
     };
@@ -50,13 +52,14 @@ namespace boost { namespace fusion { namespace detail
     struct make_descent_cons
     {
         typedef cons<Iterator> type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type apply(Iterator const& it)
         {
             return type(it);
         }
     };
-    
+
     template<class Iterator>
     struct make_descent_cons<Iterator,
         typename enable_if<traits::is_sequence<
@@ -67,20 +70,21 @@ namespace boost { namespace fusion { namespace detail
         typedef typename
             remove_reference<typename result_of::deref<Iterator>::type>::type
         sub_sequence;
-        
+
         typedef typename
             result_of::begin<sub_sequence>::type
         sub_begin;
-            
+
         typedef cons<Iterator, typename make_descent_cons<sub_begin>::type> type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type apply(Iterator const& it)
         {
             return type(it, make_descent_cons<sub_begin>::apply(
                 fusion::begin(*it)));
         }
     };
-    
+
     template<class Cons, class Base>
     struct build_flatten_view_iterator;
 
@@ -88,26 +92,28 @@ namespace boost { namespace fusion { namespace detail
     struct build_flatten_view_iterator<cons<Car>, Base>
     {
         typedef flatten_view_iterator<Car, Base> type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type apply(cons<Car> const& cons, Base const& base)
         {
             return type(cons.car, base);
         }
     };
-    
+
     template<class Car, class Cdr, class Base>
     struct build_flatten_view_iterator<cons<Car, Cdr>, Base>
     {
         typedef flatten_view_iterator<Car, Base> next_base;
         typedef build_flatten_view_iterator<Cdr, next_base> next;
         typedef typename next::type type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type apply(cons<Car, Cdr> const& cons, Base const& base)
         {
             return next::apply(cons.cdr, next_base(cons.car, base));
         }
     };
-    
+
     template<class Base, class Iterator, class = void>
     struct seek_descent
     {
@@ -117,14 +123,15 @@ namespace boost { namespace fusion { namespace detail
             build_flatten_view_iterator<cons_type, Base>
         build_flatten_view_iterator_;
         typedef typename build_flatten_view_iterator_::type type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type apply(Base const& base, Iterator const& it)
         {
             return build_flatten_view_iterator_::apply(
                 make_descent_cons_::apply(it), base);
         }
     };
-    
+
     template<class Base, class Iterator>
     struct seek_descent<Base, Iterator,
         typename enable_if<
@@ -132,7 +139,8 @@ namespace boost { namespace fusion { namespace detail
                     typename result_of::value_of<Base>::type>::type> >::type>
     {
         typedef typename result_of::next<Base>::type type;
-        
+
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static inline type apply(Base const& base, Iterator const&)
         {
             return fusion::next(base);
@@ -151,10 +159,11 @@ namespace boost { namespace fusion { namespace extension
             typedef typename Iterator::first_type first_type;
             typedef typename Iterator::base_type base_type;
             typedef typename result_of::next<first_type>::type next_type;
-            
+
             typedef detail::seek_descent<base_type, next_type> seek_descent;
             typedef typename seek_descent::type type;
 
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline
             type call(Iterator const& it)
             {
@@ -162,7 +171,7 @@ namespace boost { namespace fusion { namespace extension
             }
         };
     };
-    
+
     template<>
     struct deref_impl<flatten_view_iterator_tag>
     {
@@ -173,6 +182,7 @@ namespace boost { namespace fusion { namespace extension
                 result_of::deref<typename Iterator::first_type>::type
             type;
 
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static inline
             type call(Iterator const& it)
             {
@@ -180,13 +190,13 @@ namespace boost { namespace fusion { namespace extension
             }
         };
     };
-    
+
     template<>
     struct value_of_impl<flatten_view_iterator_tag>
     {
         template<typename Iterator>
         struct apply
-        { 
+        {
             typedef typename
                 result_of::value_of<typename Iterator::first_type>::type
             type;
diff --git a/include/boost/fusion/view/iterator_range/detail/at_impl.hpp b/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
index 0626ae2e..20f17583 100644
--- a/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                 typedef typename result_of::advance<begin_type,N>::type pos;
                 typedef typename result_of::deref<pos>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Seq& s)
                 {
diff --git a/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp b/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
index e34b6ede..7e00dec0 100644
--- a/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
@@ -7,6 +7,8 @@
 #if !defined(FUSION_BEGIN_IMPL_05062005_1226)
 #define FUSION_BEGIN_IMPL_05062005_1226
 
+#include <boost/fusion/support/config.hpp>
+
 namespace boost { namespace fusion
 {
     struct iterator_range_tag;
@@ -24,7 +26,7 @@ namespace boost { namespace fusion
             {
                 typedef typename Sequence::begin_type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/iterator_range/detail/end_impl.hpp b/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
index 2428198c..b76aa91c 100644
--- a/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
@@ -7,6 +7,8 @@
 #if !defined(FUSION_END_IMPL_05062005_1226)
 #define FUSION_END_IMPL_05062005_1226
 
+#include <boost/fusion/support/config.hpp>
+
 namespace boost { namespace fusion
 {
     struct iterator_range_tag;
@@ -24,7 +26,7 @@ namespace boost { namespace fusion
             {
                 typedef typename Sequence::end_type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp b/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
index 9a744a59..d35e580f 100644
--- a/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
@@ -48,7 +48,7 @@ namespace boost { namespace fusion
     }
 
     template <typename Sequence, typename T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
@@ -57,7 +57,7 @@ namespace boost { namespace fusion
     push_back(Sequence const& seq, T const& x);
 
     template <typename Sequence, typename T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline typename
         lazy_enable_if<
             traits::is_sequence<Sequence>
@@ -152,7 +152,7 @@ namespace boost { namespace fusion { namespace detail
             >
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Stack const& stack)
         {
             //return segment_sequence(
@@ -199,7 +199,7 @@ namespace boost { namespace fusion { namespace detail
             >
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Stack const& stack)
         {
             // return iterator_range(begin(car(cdr(stack_begin))), end(front(car(stack_begin))));
@@ -212,7 +212,7 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef typename Stack::cdr_type type; // nil_
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Stack const &stack)
         {
             return stack.cdr;
@@ -298,7 +298,7 @@ namespace boost { namespace fusion { namespace detail
             >
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Stack const& stack)
         {
             //  return segment_sequence(
@@ -345,7 +345,7 @@ namespace boost { namespace fusion { namespace detail
             >
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Stack const& stack)
         {
             // return iterator_range(begin(front(car(stack_end))), begin(car(cdr(stack_end))));
@@ -358,7 +358,7 @@ namespace boost { namespace fusion { namespace detail
     {
         typedef typename Stack::cdr_type type; // nil_
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Stack const& stack)
         {
             return stack.cdr;
@@ -437,7 +437,7 @@ namespace boost { namespace fusion { namespace detail
             >
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(StackBegin stack_begin, StackEnd stack_end)
         {
             //return segment_sequence(
@@ -471,7 +471,7 @@ namespace boost { namespace fusion { namespace detail
             typename impl::type
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(StackBegin stack_begin, StackEnd stack_end)
         {
             return impl::call(stack_begin.cdr, stack_end.cdr);
@@ -501,7 +501,7 @@ namespace boost { namespace fusion { namespace detail
             segment_sequence<segment_type>
         type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(StackBegin stack_begin, StackEnd stack_end)
         {
             //return segment_sequence(
@@ -531,7 +531,7 @@ namespace boost { namespace fusion { namespace detail
 
         typedef typename impl::type type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         static type call(Begin const& begin, End const& end)
         {
             return impl::call(
diff --git a/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp b/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
index 9d570cf1..bbf4c45a 100644
--- a/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
                     typename result_of::segments<typename impl::type>::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence & seq)
                 {
                     return fusion::segments(impl::call(seq.first, seq.last));
diff --git a/include/boost/fusion/view/iterator_range/iterator_range.hpp b/include/boost/fusion/view/iterator_range/iterator_range.hpp
index f5aafd4a..272abcd9 100644
--- a/include/boost/fusion/view/iterator_range/iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range/iterator_range.hpp
@@ -44,7 +44,7 @@ namespace boost { namespace fusion
 
         typedef typename traits::category_of<begin_type>::type category;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         iterator_range(First const& in_first, Last const& in_last)
             : first(convert_iterator<First>::call(in_first))
             , last(convert_iterator<Last>::call(in_last)) {}
diff --git a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
index f58d1290..b7a961a7 100644
--- a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
@@ -43,21 +43,21 @@ namespace boost { namespace fusion
                     >::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s, mpl::true_)
                 {
                     return s.concat();
                 }
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s, mpl::false_)
                 {
                     return type(s.first(), s.concat());
                 }
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
index 02780d99..2d5f8317 100644
--- a/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/deref_data_impl.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace fusion { namespace extension
                 result_of::deref_data<typename It::first_type>::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/view/joint_view/detail/end_impl.hpp b/include/boost/fusion/view/joint_view/detail/end_impl.hpp
index b9e01138..0b4b9b0a 100644
--- a/include/boost/fusion/view/joint_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/end_impl.hpp
@@ -28,7 +28,7 @@ namespace boost { namespace fusion
             {
                 typedef typename Sequence::concat_last_type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/joint_view/detail/next_impl.hpp b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
index a3c066d1..a7d18757 100644
--- a/include/boost/fusion/view/joint_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
@@ -45,21 +45,21 @@ namespace boost { namespace fusion
                     >::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i, mpl::true_)
                 {
                     return i.concat;
                 }
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i, mpl::false_)
                 {
                     return type(fusion::next(i.first), i.concat);
                 }
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/joint_view/joint_view.hpp b/include/boost/fusion/view/joint_view/joint_view.hpp
index 3ad31914..676cbc54 100644
--- a/include/boost/fusion/view/joint_view/joint_view.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view.hpp
@@ -56,17 +56,17 @@ namespace boost { namespace fusion
             result_of::size<Sequence1>::value + result_of::size<Sequence2>::value>
         size;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         joint_view(Sequence1& in_seq1, Sequence2& in_seq2)
             : seq1(in_seq1)
             , seq2(in_seq2)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first_type first() const { return fusion::begin(seq1); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         concat_type concat() const { return fusion::begin(seq2); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         concat_last_type concat_last() const { return fusion::end(seq2); }
 
     private:
diff --git a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
index 98584740..d75ca90d 100644
--- a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
@@ -41,7 +41,7 @@ namespace boost { namespace fusion
         typedef Category category;
         BOOST_STATIC_ASSERT((!result_of::equal_to<first_type, last_type>::value));
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         joint_view_iterator(First const& in_first, Concat const& in_concat)
             : first(first_converter::call(in_first))
             , concat(concat_converter::call(in_concat))
diff --git a/include/boost/fusion/view/nview/detail/advance_impl.hpp b/include/boost/fusion/view/nview/detail/advance_impl.hpp
index ad82983e..7c74a386 100644
--- a/include/boost/fusion/view/nview/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/advance_impl.hpp
@@ -12,7 +12,7 @@
 #include <boost/mpl/advance.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     struct nview_iterator_tag;
 
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
                 typedef nview_iterator<sequence_type, 
                     typename mpl::advance<iterator_type, Dist>::type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/nview/detail/at_impl.hpp b/include/boost/fusion/view/nview/detail/at_impl.hpp
index 45f9faf6..b9f41def 100644
--- a/include/boost/fusion/view/nview/detail/at_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/at_impl.hpp
@@ -11,7 +11,7 @@
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
-namespace boost { namespace fusion 
+namespace boost { namespace fusion
 {
     struct nview_tag;
 
@@ -32,8 +32,8 @@ namespace boost { namespace fusion
                 typedef typename result_of::at<index_type, N>::type index;
                 typedef typename result_of::at<sequence_type, index>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
-                static type 
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+                static type
                 call(Sequence& seq)
                 {
                     return fusion::at<index>(seq.seq);
diff --git a/include/boost/fusion/view/nview/detail/begin_impl.hpp b/include/boost/fusion/view/nview/detail/begin_impl.hpp
index ca600b9a..bab5e221 100644
--- a/include/boost/fusion/view/nview/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/begin_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
                 typedef nview_iterator<Sequence, 
                     typename mpl::begin<index_type>::type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& s)
                 {
                     return type(s);
diff --git a/include/boost/fusion/view/nview/detail/deref_impl.hpp b/include/boost/fusion/view/nview/detail/deref_impl.hpp
index bbdb9825..85991021 100644
--- a/include/boost/fusion/view/nview/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/deref_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                 typedef typename result_of::at<
                     typename sequence_type::sequence_type, index>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Iterator const& i)
                 {
                     return at<index>(i.seq.seq);
diff --git a/include/boost/fusion/view/nview/detail/distance_impl.hpp b/include/boost/fusion/view/nview/detail/distance_impl.hpp
index e3e5a9a0..a036300f 100644
--- a/include/boost/fusion/view/nview/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/distance_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                     typename First::first_type, typename Last::first_type
                 >::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(First const& /*first*/, Last const& /*last*/)
                 {
diff --git a/include/boost/fusion/view/nview/detail/end_impl.hpp b/include/boost/fusion/view/nview/detail/end_impl.hpp
index d36260db..0a6efe56 100644
--- a/include/boost/fusion/view/nview/detail/end_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/end_impl.hpp
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
                 typedef nview_iterator<Sequence, 
                     typename mpl::end<index_type>::type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Sequence& s)
                 {
                     return type(s);
diff --git a/include/boost/fusion/view/nview/detail/next_impl.hpp b/include/boost/fusion/view/nview/detail/next_impl.hpp
index 5193bfe6..3c304096 100644
--- a/include/boost/fusion/view/nview/detail/next_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/next_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
                 typedef nview_iterator<sequence_type,
                     typename mpl::next<first_type>::type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/nview/detail/nview_impl.hpp b/include/boost/fusion/view/nview/detail/nview_impl.hpp
index 6c7a3e21..e0d93356 100644
--- a/include/boost/fusion/view/nview/detail/nview_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/nview_impl.hpp
@@ -63,7 +63,7 @@ namespace boost { namespace fusion { namespace result_of
 namespace boost { namespace fusion
 {
     template<BOOST_PP_ENUM_PARAMS(N, int I), typename Sequence>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline nview<Sequence, mpl::vector_c<int, BOOST_PP_ENUM_PARAMS(N, I)> >
     as_nview(Sequence& s)
     {
diff --git a/include/boost/fusion/view/nview/detail/prior_impl.hpp b/include/boost/fusion/view/nview/detail/prior_impl.hpp
index 374b45f6..470c5bd3 100644
--- a/include/boost/fusion/view/nview/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/prior_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
                 typedef nview_iterator<sequence_type,
                     typename mpl::prior<first_type>::type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/nview/nview.hpp b/include/boost/fusion/view/nview/nview.hpp
index 45b7380b..2e257c81 100644
--- a/include/boost/fusion/view/nview/nview.hpp
+++ b/include/boost/fusion/view/nview/nview.hpp
@@ -40,7 +40,7 @@ namespace boost { namespace fusion
 
 #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
             template <typename T>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename add_reference<T>::type 
             operator()(T& x) const
             {
@@ -48,7 +48,7 @@ namespace boost { namespace fusion
             }
 #else
             template <typename T>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<addref(T)>::type
             operator()(T&& x) const
             {
@@ -68,7 +68,7 @@ namespace boost { namespace fusion
             {};
 
             template <typename T>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename add_reference<typename add_const<T>::type>::type 
             operator()(T& x) const
             {
@@ -76,7 +76,7 @@ namespace boost { namespace fusion
             }
 
             template <typename T>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename add_reference<typename add_const<T>::type>::type 
             operator()(T const& x) const
             {
@@ -108,7 +108,8 @@ namespace boost { namespace fusion
         typedef typename result_of::as_vector<transform_view_type>::type 
             sequence_type;
 
-        BOOST_FUSION_GPU_ENABLED explicit nview(Sequence& val)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit nview(Sequence& val)
           : seq(sequence_type(transform_view_type(val, transform_type()))) 
         {}
 
diff --git a/include/boost/fusion/view/nview/nview_iterator.hpp b/include/boost/fusion/view/nview/nview_iterator.hpp
index c614cbbb..cb2541b5 100644
--- a/include/boost/fusion/view/nview/nview_iterator.hpp
+++ b/include/boost/fusion/view/nview/nview_iterator.hpp
@@ -42,7 +42,8 @@ namespace boost { namespace fusion
         typedef Sequence sequence_type;
         typedef mpl_iterator<Pos> first_type;
 
-        BOOST_FUSION_GPU_ENABLED explicit nview_iterator(Sequence& in_seq)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit nview_iterator(Sequence& in_seq)
           : seq(in_seq) {}
 
         Sequence& seq;
diff --git a/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
index 3da6b21d..9a27156c 100644
--- a/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
                 typedef repetitive_view_iterator<sequence_type,
                     typename result_of::begin<sequence_type>::type > type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(View const& v)
                 {
                     return type(v.seq);
diff --git a/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
index c54ff38e..c96ef5eb 100644
--- a/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
                     result_of::deref<typename Iterator::pos_type>::type
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Iterator const& i)
                 {
                     return *i.pos;
diff --git a/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
index ca1c270f..af1fa6ee 100644
--- a/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
                 typedef repetitive_view_iterator<sequence_type,
                     typename result_of::end<sequence_type>::type > type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(View const& v)
                 {
                     return type(v.seq,end(v.seq));
diff --git a/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
index acefd513..fab75408 100644
--- a/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
@@ -42,7 +42,7 @@ namespace boost { namespace fusion
                     >
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Iterator const& i)
                 {
                     return type(i.seq, next(i.pos));
@@ -59,7 +59,7 @@ namespace boost { namespace fusion
                     > 
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Iterator const& i)
                 {
                     return type(i.seq);
@@ -80,7 +80,7 @@ namespace boost { namespace fusion
 
                 typedef Iterator type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Iterator const& i)
                 {
                     return type(i);
diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
index ab0a3b18..32718e04 100644
--- a/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
+++ b/include/boost/fusion/view/repetitive_view/repetitive_view.hpp
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
             mpl::if_<traits::is_view<Sequence>, Sequence, sequence_type&>::type
         stored_seq_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         repetitive_view(Sequence& in_seq)
             : seq(in_seq) {}
 
diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
index b9f45d0c..df2f228c 100644
--- a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
+++ b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
@@ -36,16 +36,16 @@ namespace boost { namespace fusion
         typedef typename convert_iterator<typename result_of::end<Sequence>::type>::type end_type;
         typedef single_pass_traversal_tag category;
 
-        BOOST_FUSION_GPU_ENABLED explicit repetitive_view_iterator(Sequence& in_seq)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit repetitive_view_iterator(Sequence& in_seq)
             : seq(in_seq), pos(begin(in_seq)) {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         repetitive_view_iterator(Sequence& in_seq, pos_type const& in_pos)
             : seq(in_seq), pos(in_pos) {}
 
         Sequence& seq;
         pos_type pos;
-        
 
     private:
         // silence MSVC warning C4512: assignment operator could not be generated
diff --git a/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp b/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
index 1304d0a9..42b3bd19 100644
--- a/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion {
                 typedef typename result_of::advance<first_type, negative_dist>::type advanced_type;
                 typedef reverse_view_iterator<advanced_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/reverse_view/detail/at_impl.hpp b/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
index ebad8f35..d1fc7715 100644
--- a/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/at_impl.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion { namespace extension
                 result_of::at<typename Seq::seq_type, real_n>::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(Seq& seq)
             {
diff --git a/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp b/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
index 2f20df57..913725ed 100644
--- a/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
             {
                 typedef reverse_view_iterator<typename Sequence::last_type> type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence const& s)
                 {
diff --git a/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
index 20d381ba..e93b8fba 100644
--- a/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/deref_data_impl.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace fusion { namespace extension
                 result_of::deref_data<typename It::first_type>::type
             type;
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             static type
             call(It const& it)
             {
diff --git a/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp b/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
index 530921fe..9ea60d81 100644
--- a/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                     >::type
                 type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp b/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
index 3a5fdc61..49436c26 100644
--- a/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion {
                 typedef typename Last::first_type last_type;
                 typedef typename result_of::distance<last_type, first_type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(First const& first, Last const& last)
                 {
diff --git a/include/boost/fusion/view/reverse_view/detail/end_impl.hpp b/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
index 1747d64f..06602c0e 100644
--- a/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
             {
                 typedef reverse_view_iterator<typename Sequence::first_type> type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence const& s)
                 {
diff --git a/include/boost/fusion/view/reverse_view/detail/next_impl.hpp b/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
index 1aaa6920..58c1f5f7 100644
--- a/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
     
                 typedef reverse_view_iterator<typename wrapped::type> type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp b/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
index 4007ad4d..69d18501 100644
--- a/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
     
                 typedef reverse_view_iterator<typename wrapped::type> type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/reverse_view/reverse_view.hpp b/include/boost/fusion/view/reverse_view/reverse_view.hpp
index 3b134d5f..0a9aca27 100644
--- a/include/boost/fusion/view/reverse_view/reverse_view.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view.hpp
@@ -50,14 +50,14 @@ namespace boost { namespace fusion
                 bidirectional_traversal_tag
               , typename traits::category_of<first_type>::type>::value));
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         reverse_view(Sequence& in_seq)
             : seq(in_seq)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first_type first() const { return fusion::begin(seq); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
 
diff --git a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
index 9de2169e..d1d023a2 100644
--- a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
@@ -42,7 +42,7 @@ namespace boost { namespace fusion
                 bidirectional_traversal_tag
               , category>::value));
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         reverse_view_iterator(First const& in_first)
             : first(converter::call(in_first)) {}
 
diff --git a/include/boost/fusion/view/single_view/detail/advance_impl.hpp b/include/boost/fusion/view/single_view/detail/advance_impl.hpp
index 9dd9e4d7..5af22321 100644
--- a/include/boost/fusion/view/single_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/advance_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                     typename mpl::plus<typename Iterator::position, Dist>::type>
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/at_impl.hpp b/include/boost/fusion/view/single_view/detail/at_impl.hpp
index b63497c8..6c4c7579 100644
--- a/include/boost/fusion/view/single_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/at_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                 BOOST_MPL_ASSERT((mpl::equal_to<N, mpl::int_<0> >));
                 typedef typename Sequence::value_type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type 
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/begin_impl.hpp b/include/boost/fusion/view/single_view/detail/begin_impl.hpp
index 63e42923..d6bca8f6 100644
--- a/include/boost/fusion/view/single_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/begin_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
             {
                 typedef single_view_iterator<Sequence, mpl::int_<0> > type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/deref_impl.hpp b/include/boost/fusion/view/single_view/detail/deref_impl.hpp
index ad50a413..acb90d83 100644
--- a/include/boost/fusion/view/single_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/deref_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
                 BOOST_MPL_ASSERT((mpl::equal_to<typename Iterator::position, mpl::int_<0> >));
                 typedef typename Iterator::value_type type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/distance_impl.hpp b/include/boost/fusion/view/single_view/detail/distance_impl.hpp
index 73231b41..9cd85fdc 100644
--- a/include/boost/fusion/view/single_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/distance_impl.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace fusion
                 typedef typename mpl::minus<typename Last::position,
                     typename First::position>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(First const& /*first*/, Last const& /*last*/)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/end_impl.hpp b/include/boost/fusion/view/single_view/detail/end_impl.hpp
index 50a7c562..d662ac24 100644
--- a/include/boost/fusion/view/single_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/end_impl.hpp
@@ -31,7 +31,7 @@ namespace boost { namespace fusion
             {
                 typedef single_view_iterator<Sequence, mpl::int_<1> > type;
     
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& seq)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/next_impl.hpp b/include/boost/fusion/view/single_view/detail/next_impl.hpp
index d5e0ac80..41c658f3 100644
--- a/include/boost/fusion/view/single_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/next_impl.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
                     typename mpl::next<typename Iterator::position>::type>
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/single_view/detail/prior_impl.hpp b/include/boost/fusion/view/single_view/detail/prior_impl.hpp
index c34e481a..823f96e5 100644
--- a/include/boost/fusion/view/single_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/prior_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
                     typename mpl::prior<typename Iterator::position>::type>
                 type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/single_view/single_view.hpp b/include/boost/fusion/view/single_view/single_view.hpp
index 36c2c931..a4437902 100644
--- a/include/boost/fusion/view/single_view/single_view.hpp
+++ b/include/boost/fusion/view/single_view/single_view.hpp
@@ -43,18 +43,19 @@ namespace boost { namespace fusion
         typedef mpl::int_<1> size;
         typedef T value_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         single_view()
             : val() {}
 
-        BOOST_FUSION_GPU_ENABLED explicit single_view(typename detail::call_param<T>::type in_val)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit single_view(typename detail::call_param<T>::type in_val)
             : val(in_val) {}
 
         value_type val;
     };
     
     template <typename T>
-    BOOST_FUSION_GPU_ENABLED
+    BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
     inline single_view<typename detail::as_fusion_element<T>::type>
     make_single_view(T const& v)
     {
diff --git a/include/boost/fusion/view/single_view/single_view_iterator.hpp b/include/boost/fusion/view/single_view/single_view_iterator.hpp
index 128c1cae..4ab620a5 100644
--- a/include/boost/fusion/view/single_view/single_view_iterator.hpp
+++ b/include/boost/fusion/view/single_view/single_view_iterator.hpp
@@ -40,7 +40,8 @@ namespace boost { namespace fusion
         typedef Pos position;
         typedef SingleView single_view_type;
 
-        BOOST_FUSION_GPU_ENABLED explicit single_view_iterator(single_view_type& in_view)
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
+        explicit single_view_iterator(single_view_type& in_view)
             : view(in_view) {}
 
         SingleView& view;
diff --git a/include/boost/fusion/view/transform_view/detail/advance_impl.hpp b/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
index ae8a84ce..12dfabec 100644
--- a/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
@@ -39,7 +39,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::transform_type transform_type;
                 typedef transform_view_iterator<advanced_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
@@ -62,7 +62,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::transform_type transform_type;
                 typedef transform_view_iterator2<advanced1_type, advanced2_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/transform_view/detail/at_impl.hpp b/include/boost/fusion/view/transform_view/detail/at_impl.hpp
index 5c6dd8fb..d2045bc2 100644
--- a/include/boost/fusion/view/transform_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/at_impl.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion {
                 typedef typename boost::fusion::result_of::at<typename Seq::sequence_type, N>::type value_type;
                 typedef typename mpl::apply<transform_type, value_type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Seq& seq)
                 {
                     return seq.f(boost::fusion::at<N>(seq.seq));
@@ -53,7 +53,7 @@ namespace boost { namespace fusion {
                 typedef typename boost::fusion::result_of::at<typename Seq::sequence2_type, N>::type value2_type;
                 typedef typename mpl::apply<transform_type, value1_type, value2_type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type call(Seq& seq)
                 {
                     return seq.f(boost::fusion::at<N>(seq.seq1), boost::fusion::at<N>(seq.seq2));
diff --git a/include/boost/fusion/view/transform_view/detail/begin_impl.hpp b/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
index 7c40505a..da3f763a 100644
--- a/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::transform_type transform_type;
                 typedef transform_view_iterator<first_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
@@ -55,7 +55,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::transform_type transform_type;
                 typedef transform_view_iterator2<first1_type, first2_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
index 35dacbd1..646da57c 100644
--- a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
@@ -37,7 +37,7 @@ namespace boost { namespace fusion
                 typedef detail::apply_transform_result<typename Iterator::transform_type> transform_type;
                 typedef typename mpl::apply<transform_type, value_type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
@@ -63,7 +63,7 @@ namespace boost { namespace fusion
                 typedef detail::apply_transform_result<typename Iterator::transform_type> transform_type;
                 typedef typename mpl::apply<transform_type, value1_type, value2_type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/transform_view/detail/distance_impl.hpp b/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
index ecbc8c5d..64443055 100644
--- a/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
@@ -29,7 +29,7 @@ namespace boost { namespace fusion {
             struct apply
                 : result_of::distance<typename First::first_type, typename Last::first_type>
             {
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static 
                 typename result_of::distance<typename First::first_type, typename Last::first_type>::type
                 call(First const& first, Last const& last)
@@ -47,7 +47,7 @@ namespace boost { namespace fusion {
             struct apply
                 : result_of::distance<typename First::first1_type, typename Last::first1_type>
             {
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static 
                 typename result_of::distance<typename First::first1_type, typename Last::first1_type>::type
                 call(First const& first, Last const& last)
diff --git a/include/boost/fusion/view/transform_view/detail/end_impl.hpp b/include/boost/fusion/view/transform_view/detail/end_impl.hpp
index 58e161b1..3a84e040 100644
--- a/include/boost/fusion/view/transform_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/end_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::transform_type transform_type;
                 typedef transform_view_iterator<last_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
@@ -55,7 +55,7 @@ namespace boost { namespace fusion
                 typedef typename Sequence::transform_type transform_type;
                 typedef transform_view_iterator2<last1_type, last2_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& s)
                 {
diff --git a/include/boost/fusion/view/transform_view/detail/next_impl.hpp b/include/boost/fusion/view/transform_view/detail/next_impl.hpp
index cebba595..ce22d19e 100644
--- a/include/boost/fusion/view/transform_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/next_impl.hpp
@@ -38,7 +38,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::transform_type transform_type;
                 typedef transform_view_iterator<next_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
@@ -61,7 +61,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::transform_type transform_type;
                 typedef transform_view_iterator2<next1_type, next2_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/transform_view/detail/prior_impl.hpp b/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
index 19c802c6..ed6d742e 100644
--- a/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
@@ -39,7 +39,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::transform_type transform_type;
                 typedef transform_view_iterator<prior_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
@@ -62,7 +62,7 @@ namespace boost { namespace fusion
                 typedef typename Iterator::transform_type transform_type;
                 typedef transform_view_iterator2<prior1_type, prior2_type, transform_type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& i)
                 {
diff --git a/include/boost/fusion/view/transform_view/transform_view.hpp b/include/boost/fusion/view/transform_view/transform_view.hpp
index d18f49c6..4a6fc5b1 100644
--- a/include/boost/fusion/view/transform_view/transform_view.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view.hpp
@@ -56,20 +56,20 @@ namespace boost { namespace fusion
         typedef Sequence2 sequence2_type;
         typedef F transform_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         transform_view(Sequence1& in_seq1, Sequence2& in_seq2, F const& binop)
             : f(binop)
             , seq1(in_seq1)
             , seq2(in_seq2)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first1_type first1() const { return fusion::begin(seq1); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first2_type first2() const { return fusion::begin(seq2); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last1_type last1() const { return fusion::end(seq1); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last2_type last2() const { return fusion::end(seq2); }
 
         transform_type f;
@@ -100,15 +100,15 @@ namespace boost { namespace fusion
         typedef Sequence sequence_type;
         typedef F transform_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         transform_view(Sequence& in_seq, F const& in_f)
             : seq(in_seq)
             , f(in_f)
         {}
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         first_type first() const { return fusion::begin(seq); }
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         last_type last() const { return fusion::end(seq); }
         typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq;
         transform_type f;
diff --git a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
index 0762228f..1e56639e 100644
--- a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion
         typedef typename traits::category_of<first_type>::type category;
         typedef F transform_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         transform_view_iterator(First const& in_first, F const& in_f)
             : first(converter::call(in_first)), f(in_f) {}
 
@@ -62,7 +62,7 @@ namespace boost { namespace fusion
         typedef typename traits::category_of<first1_type>::type category;
         typedef F transform_type;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         transform_view_iterator2(First1 const& in_first1, First2 const& in_first2, F const& in_f)
             : first1(converter1::call(in_first1)), first2(converter2::call(in_first2)), f(in_f) {}
 
diff --git a/include/boost/fusion/view/zip_view/detail/advance_impl.hpp b/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
index 17012ac8..69134d94 100644
--- a/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace fusion {
             };
 
             template<typename It>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_advance(It)>::type
             operator()(const It& it) const
             {
@@ -57,7 +57,7 @@ namespace boost { namespace fusion {
                 typedef zip_view_iterator<
                     typename result_of::transform<typename It::iterators, detail::poly_advance<N> >::type> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(It const& it)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/at_impl.hpp b/include/boost/fusion/view/zip_view/detail/at_impl.hpp
index f92c9817..55c0fef1 100644
--- a/include/boost/fusion/view/zip_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/at_impl.hpp
@@ -44,7 +44,7 @@ namespace boost { namespace fusion
             };
 
             template<typename Seq>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_at(Seq&)>::type
             operator()(Seq& seq) const
             {
@@ -52,14 +52,14 @@ namespace boost { namespace fusion
             }
 
             template<typename Seq>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_at(Seq const&)>::type
             operator()(Seq const& seq) const
             {
                 return fusion::at<N>(seq);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             unused_type operator()(unused_type const&) const
             {
                 return unused_type();
@@ -82,7 +82,7 @@ namespace boost { namespace fusion
                     typename result_of::transform<
                     typename Seq::sequences, detail::poly_at<N> >::type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Seq& seq)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/begin_impl.hpp b/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
index 32be2c7d..75e13751 100644
--- a/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
@@ -41,7 +41,7 @@ namespace boost { namespace fusion {
             };
 
             template<typename Seq>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_begin(Seq&)>::type
             operator()(Seq& seq) const
             {
@@ -49,14 +49,14 @@ namespace boost { namespace fusion {
             }
 
             template<typename Seq>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_begin(Seq const&)>::type
             operator()(Seq const& seq) const
             {
                 return fusion::begin(seq);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             unused_type operator()(unused_type const&) const
             {
                 return unused_type();
@@ -79,7 +79,7 @@ namespace boost { namespace fusion {
                     typename result_of::transform<typename Sequence::sequences, detail::poly_begin>::type,
                     typename Sequence::category> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& sequence)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/deref_impl.hpp b/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
index e9f091c3..df7e91ae 100644
--- a/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
@@ -43,14 +43,14 @@ namespace boost { namespace fusion {
             };
 
             template<typename It>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_deref(It)>::type
             operator()(const It& it) const
             {
                 return fusion::deref(it);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             unused_type operator()(unused_type const&) const
             {
                 return unused_type();
@@ -72,7 +72,7 @@ namespace boost { namespace fusion {
                 typedef typename result_of::as_vector<
                     typename result_of::transform<typename It::iterators, detail::poly_deref>::type>::type type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(It const& it)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/distance_impl.hpp b/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
index 8beaccca..f306e1b4 100644
--- a/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
@@ -70,7 +70,7 @@ namespace boost { namespace fusion {
             struct apply
                 : detail::zip_view_iterator_distance<It1, It2>::type
             {
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static typename detail::zip_view_iterator_distance<It1, It2>::type
                 call(It1 const& /*it1*/, It2 const& /*it2*/)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/end_impl.hpp b/include/boost/fusion/view/zip_view/detail/end_impl.hpp
index d57b08fb..28549cb7 100644
--- a/include/boost/fusion/view/zip_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/end_impl.hpp
@@ -55,7 +55,7 @@ namespace boost { namespace fusion {
             };
 
             template<typename Seq>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<endpoints(Seq&)>::type
             operator()(Seq& seq) const
             {
@@ -63,14 +63,14 @@ namespace boost { namespace fusion {
             }
 
             template<typename Seq>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<endpoints(Seq const&)>::type
             operator()(Seq const& seq) const
             {
                 return fusion::advance<M>(fusion::begin(seq));
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             unused_type operator()(unused_type const&) const
             {
                 return unused_type();
@@ -93,7 +93,7 @@ namespace boost { namespace fusion {
                     typename result_of::transform<typename Sequence::sequences, detail::endpoints<typename Sequence::size> >::type,
                     typename Sequence::category> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Sequence& sequence)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/next_impl.hpp b/include/boost/fusion/view/zip_view/detail/next_impl.hpp
index e9236b42..4bcd90a5 100644
--- a/include/boost/fusion/view/zip_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/next_impl.hpp
@@ -42,14 +42,14 @@ namespace boost { namespace fusion {
             };
 
             template<typename It>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_next(It)>::type
             operator()(const It& it) const
             {
                 return fusion::next(it);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             unused_type operator()(unused_type const&) const
             {
                 return unused_type();
@@ -72,7 +72,7 @@ namespace boost { namespace fusion {
                     typename result_of::transform<typename Iterator::iterators, detail::poly_next>::type,
                     typename Iterator::category> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& it)
                 {
diff --git a/include/boost/fusion/view/zip_view/detail/prior_impl.hpp b/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
index aa692295..655b5092 100644
--- a/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
@@ -41,14 +41,14 @@ namespace boost { namespace fusion {
             };
 
             template<typename It>
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             typename result<poly_prior(It)>::type
             operator()(const It& it) const
             {
                 return fusion::prior(it);
             }
 
-            BOOST_FUSION_GPU_ENABLED
+            BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
             unused_type operator()(unused_type const&) const
             {
                 return unused_type();
@@ -71,7 +71,7 @@ namespace boost { namespace fusion {
                     typename result_of::transform<typename Iterator::iterators, detail::poly_prior>::type,
                     typename Iterator::category> type;
 
-                BOOST_FUSION_GPU_ENABLED
+                BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
                 static type
                 call(Iterator const& it)
 
diff --git a/include/boost/fusion/view/zip_view/zip_view.hpp b/include/boost/fusion/view/zip_view/zip_view.hpp
index 4e807f73..cf6f6d27 100644
--- a/include/boost/fusion/view/zip_view/zip_view.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view.hpp
@@ -122,7 +122,7 @@ namespace boost { namespace fusion {
         typedef typename fusion::result_of::as_vector<Sequences>::type sequences;
         typedef typename detail::min_size<real_sequences>::type size;
 
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         zip_view(
             const Sequences& seqs)
             : sequences_(seqs)
diff --git a/include/boost/fusion/view/zip_view/zip_view_iterator.hpp b/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
index fec50e6f..49c2dc78 100644
--- a/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
@@ -35,7 +35,7 @@ namespace boost { namespace fusion {
         typedef Traversal category;
 
         template<typename InitSeq>
-        BOOST_FUSION_GPU_ENABLED
+        BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED
         zip_view_iterator(
             const InitSeq& iterator_seq)
             : iterators_(iterator_seq)
diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg
index 3fd87116..b88198d7 100644
--- a/preprocess/wave.cfg
+++ b/preprocess/wave.cfg
@@ -8,10 +8,12 @@
 -DBOOST_FUSION_CREATE_PREPROCESSED_FILES
 -D_WIN32
 -D_M_IX86
+-NBOOST_CLANG
 -NBOOST_STATIC_ASSERT
 -NBOOST_FORCEINLINE
 -NBOOST_CONSTEXPR
 -NBOOST_CXX14_CONSTEXPR
+-NBOOST_NOEXCEPT
 -NBOOST_NO_CXX11_RVALUE_REFERENCES
 -NBOOST_MPL_ASSERT
 -NBOOST_MPL_ASSERT_MSG