Imported Upstream version 1.57.0

[platform/upstream/boost.git] / boost / phoenix / core / value.hpp

diff --git a/boost/phoenix/core/value.hpp b/boost/phoenix/core/value.hpp
index 9d757d3..bb381e9 100644 (file)
--- a/boost/phoenix/core/value.hpp
+++ b/boost/phoenix/core/value.hpp
@@ -29,12 +29,24 @@ namespace boost { namespace phoenix
         template <typename T>
         struct value
             : expression::terminal<T>
-        {};
+        {
+            typedef
+                typename expression::terminal<T>::type
+                type;
+           /*
+            static const type make(T & t)
+            {
+                typename value<T>::type const e = {{t}};
+                return e;
+            }
+           */
+        };
     }
 
     template <typename T>
+    inline
     typename expression::value<T>::type const
-    inline val(T t)
+    val(T t)
     {
         return expression::value<T>::make(t);
     }
@@ -55,11 +67,11 @@ namespace boost { namespace phoenix
         template <typename This, typename Actor, typename Context>
         struct result<This(Actor, Context)>
             : boost::remove_const<
-                                   typename boost::remove_reference<
-                    typename evaluator::impl<Actor, Context, int>::result_type
-                >::type
-                               >
-        {};     
+                    typename boost::remove_reference<
+                    typename evaluator::impl<Actor, Context, proto::empty_env>::result_type
+                 >::type
+             >
+        {};
 
         template <typename Context>
         typename result<custom_terminal(actor<Expr> const &, Context &)>::type