Imported Upstream version 1.63.0upstream/1.63.0

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

9 files changed, 20 insertions, 14 deletions

diff --git a/boost/phoenix/function/detail/function_operator.hpp b/boost/phoenix/function/detail/cpp03/function_operator.hpp
index 64fcadfe6c..e0e3dd95e4 100644
--- a/boost/phoenix/function/detail/function_operator.hpp
+++ b/boost/phoenix/function/detail/cpp03/function_operator.hpp
@@ -3,7 +3,7 @@
 #ifndef BOOST_PHOENIX_FUNCTION_DETAIL_FUNCTION_OPERATOR_HPP
 #define BOOST_PHOENIX_FUNCTION_DETAIL_FUNCTION_OPERATOR_HPP
 
-#include <boost/phoenix/function/detail/preprocessed/function_operator.hpp>
+#include <boost/phoenix/function/detail/cpp03/preprocessed/function_operator.hpp>
 
 #endif
 #else
@@ -31,7 +31,7 @@
 
 #define BOOST_PHOENIX_ITERATION_PARAMS                                          \
     (3, (1, BOOST_PHOENIX_ACTOR_LIMIT,                                          \
-    <boost/phoenix/function/detail/function_operator.hpp>))
+    <boost/phoenix/function/detail/cpp03/function_operator.hpp>))
 #include BOOST_PHOENIX_ITERATE()
 
 #if defined(__WAVE__) && defined(BOOST_PHOENIX_CREATE_PREPROCESSED_FILES)
diff --git a/boost/phoenix/function/detail/preprocessed/function_operator.hpp b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator.hpp
index 2c9e8ae3e8..b8ce4848c4 100644
--- a/boost/phoenix/function/detail/preprocessed/function_operator.hpp
+++ b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator.hpp
@@ -9,15 +9,15 @@
 #define BOOST_PHOENIX_PREPROCESSED_FUNCTION_OPERATOR
 
 #if BOOST_PHOENIX_LIMIT <= 10
-#include <boost/phoenix/function/detail/preprocessed/function_operator_10.hpp>
+#include <boost/phoenix/function/detail/cpp03/preprocessed/function_operator_10.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 20
-#include <boost/phoenix/function/detail/preprocessed/function_operator_20.hpp>
+#include <boost/phoenix/function/detail/cpp03/preprocessed/function_operator_20.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 30
-#include <boost/phoenix/function/detail/preprocessed/function_operator_30.hpp>
+#include <boost/phoenix/function/detail/cpp03/preprocessed/function_operator_30.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 40
-#include <boost/phoenix/function/detail/preprocessed/function_operator_40.hpp>
+#include <boost/phoenix/function/detail/cpp03/preprocessed/function_operator_40.hpp>
 #elif BOOST_PHOENIX_LIMIT <= 50
-#include <boost/phoenix/function/detail/preprocessed/function_operator_50.hpp>
+#include <boost/phoenix/function/detail/cpp03/preprocessed/function_operator_50.hpp>
 #else
 #error "BOOST_PHOENIX_LIMIT out of bounds for preprocessed headers"
 #endif
diff --git a/boost/phoenix/function/detail/preprocessed/function_operator_10.hpp b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_10.hpp
index 8180470302..8180470302 100644
--- a/boost/phoenix/function/detail/preprocessed/function_operator_10.hpp
+++ b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_10.hpp
diff --git a/boost/phoenix/function/detail/preprocessed/function_operator_20.hpp b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_20.hpp
index 6772d069d7..6772d069d7 100644
--- a/boost/phoenix/function/detail/preprocessed/function_operator_20.hpp
+++ b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_20.hpp
diff --git a/boost/phoenix/function/detail/preprocessed/function_operator_30.hpp b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_30.hpp
index 542e233994..542e233994 100644
--- a/boost/phoenix/function/detail/preprocessed/function_operator_30.hpp
+++ b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_30.hpp
diff --git a/boost/phoenix/function/detail/preprocessed/function_operator_40.hpp b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_40.hpp
index 63e22cad87..63e22cad87 100644
--- a/boost/phoenix/function/detail/preprocessed/function_operator_40.hpp
+++ b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_40.hpp
diff --git a/boost/phoenix/function/detail/preprocessed/function_operator_50.hpp b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_50.hpp
index df5cf1077b..df5cf1077b 100644
--- a/boost/phoenix/function/detail/preprocessed/function_operator_50.hpp
+++ b/boost/phoenix/function/detail/cpp03/preprocessed/function_operator_50.hpp
diff --git a/boost/phoenix/function/function.hpp b/boost/phoenix/function/function.hpp
index e59f592f60..fe0ad8bc4f 100644
--- a/boost/phoenix/function/function.hpp
+++ b/boost/phoenix/function/function.hpp
@@ -10,10 +10,8 @@
 #define BOOST_PHOENIX_FUNCTION_FUNCTION_HPP
 
 #include <boost/phoenix/config.hpp>
-//#include <boost/phoenix/function/function_handling.hpp>
+#include <boost/phoenix/core/limits.hpp>
 #include <boost/phoenix/core/detail/function_eval.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/or.hpp>
 #include <boost/utility/result_of.hpp>
 
 namespace boost { namespace phoenix
@@ -21,13 +19,17 @@ namespace boost { namespace phoenix
     /////////////////////////////////////////////////////////////////////////////
     // Functions
     /////////////////////////////////////////////////////////////////////////////
-    
+
     namespace expression
     {
+#if defined(BOOST_PHOENIX_NO_VARIADIC_FUNCTION)
         template <typename F, BOOST_PHOENIX_typename_A_void(BOOST_PHOENIX_ACTOR_LIMIT)>
         struct function
             : detail::expression::function_eval<F, BOOST_PHOENIX_A(BOOST_PHOENIX_ACTOR_LIMIT)>
         {};
+#else
+      // TODO:
+#endif
     }
 
     // functor which returns our lazy function call extension
@@ -45,6 +47,7 @@ namespace boost { namespace phoenix
         template <typename Sig>
         struct result;
 
+#if defined(BOOST_PHOENIX_NO_VARIADIC_FUNCTION)
         typename detail::expression::function_eval<F>::type const
         operator()() const
         {
@@ -52,7 +55,7 @@ namespace boost { namespace phoenix
         }
 
         // Bring in the rest
-        #include <boost/phoenix/function/detail/function_operator.hpp>
+        #include <boost/phoenix/function/detail/cpp03/function_operator.hpp>
 
       // Solves the result problem for F(X)
         template <typename This, typename A0>
@@ -127,6 +130,9 @@ namespace boost { namespace phoenix
             typename boost::remove_reference<A5>::type,
             typename boost::remove_reference<A6>::type>
        {};
+#else
+      // TODO:
+#endif
 
         F f;
     };
diff --git a/boost/phoenix/function/lazy_list.hpp b/boost/phoenix/function/lazy_list.hpp
index 3510b02e70..d6cf58000d 100644
--- a/boost/phoenix/function/lazy_list.hpp
+++ b/boost/phoenix/function/lazy_list.hpp
@@ -202,10 +202,10 @@ namespace boost {
        }
 
       template <class L>
-      bool is_a_unique_type_for_nil(const L& l) {
+      bool is_a_unique_type_for_nil(const L& /*l*/) {
          return false;
       }
-  
+
       template <>
       bool is_a_unique_type_for_nil<a_unique_type_for_nil>
       (const a_unique_type_for_nil& /* n */) {