Imported Upstream version 1.58.0upstream/1.58.0

Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

12 files changed, 35 insertions, 35 deletions

diff --git a/boost/fusion/sequence/comparison/detail/equal_to.hpp b/boost/fusion/sequence/comparison/detail/equal_to.hpp
index 577023db6a..cffed6c399 100644
--- a/boost/fusion/sequence/comparison/detail/equal_to.hpp
+++ b/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/boost/fusion/sequence/comparison/detail/greater.hpp b/boost/fusion/sequence/comparison/detail/greater.hpp
index d875f16b2b..d762652935 100644
--- a/boost/fusion/sequence/comparison/detail/greater.hpp
+++ b/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/boost/fusion/sequence/comparison/detail/greater_equal.hpp b/boost/fusion/sequence/comparison/detail/greater_equal.hpp
index e0aa530e18..d15d88c404 100644
--- a/boost/fusion/sequence/comparison/detail/greater_equal.hpp
+++ b/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/boost/fusion/sequence/comparison/detail/less.hpp b/boost/fusion/sequence/comparison/detail/less.hpp
index 8964ca7d13..04377d6960 100644
--- a/boost/fusion/sequence/comparison/detail/less.hpp
+++ b/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/boost/fusion/sequence/comparison/detail/less_equal.hpp b/boost/fusion/sequence/comparison/detail/less_equal.hpp
index 10bcb76791..e61d33c4fa 100644
--- a/boost/fusion/sequence/comparison/detail/less_equal.hpp
+++ b/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/boost/fusion/sequence/comparison/detail/not_equal_to.hpp b/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
index b230ac1fba..323b2ac9d0 100644
--- a/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
+++ b/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/boost/fusion/sequence/comparison/equal_to.hpp b/boost/fusion/sequence/comparison/equal_to.hpp
index 485df0bac2..283ffefc8b 100644
--- a/boost/fusion/sequence/comparison/equal_to.hpp
+++ b/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/boost/fusion/sequence/comparison/greater.hpp b/boost/fusion/sequence/comparison/greater.hpp
index 5ad7ef74b9..fbbb7bfae2 100644
--- a/boost/fusion/sequence/comparison/greater.hpp
+++ b/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/boost/fusion/sequence/comparison/greater_equal.hpp b/boost/fusion/sequence/comparison/greater_equal.hpp
index 65904f8339..7b91a8886b 100644
--- a/boost/fusion/sequence/comparison/greater_equal.hpp
+++ b/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/boost/fusion/sequence/comparison/less.hpp b/boost/fusion/sequence/comparison/less.hpp
index 28762b7394..b056552a9e 100644
--- a/boost/fusion/sequence/comparison/less.hpp
+++ b/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/boost/fusion/sequence/comparison/less_equal.hpp b/boost/fusion/sequence/comparison/less_equal.hpp
index d0668208f0..53159926c8 100644
--- a/boost/fusion/sequence/comparison/less_equal.hpp
+++ b/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/boost/fusion/sequence/comparison/not_equal_to.hpp b/boost/fusion/sequence/comparison/not_equal_to.hpp
index 4cd94f9e53..fc2fef3343 100644
--- a/boost/fusion/sequence/comparison/not_equal_to.hpp
+++ b/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>