[Boost-commit] svn:boost r49131 - in trunk/boost/spirit/home/phoenix/scope: . detail

Subject: [Boost-commit] svn:boost r49131 - in trunk/boost/spirit/home/phoenix/scope: . detail
From: joel_at_[hidden]
Date: 2008-10-04 08:32:20

Author: djowel
Date: 2008-10-04 08:32:19 EDT (Sat, 04 Oct 2008)
New Revision: 49131
URL: http://svn.boost.org/trac/boost/changeset/49131

Log:
restored orig version without local_reference
Text files modified: 
   trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp |    25 +------------------------               
   trunk/boost/spirit/home/phoenix/scope/local_variable.hpp        |     2 +-                                      
   2 files changed, 2 insertions(+), 25 deletions(-)

Modified: trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp	2008-10-04 08:32:19 EDT (Sat, 04 Oct 2008)
@@ -21,7 +21,6 @@
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/is_reference.hpp>
-#include <boost/spirit/home/phoenix/detail/local_reference.hpp>
 
 #define PHOENIX_MAP_LOCAL_TEMPLATE_PARAM(z, n, data) \
     typename T##n = unused<n>
@@ -109,35 +108,13 @@
             type;
         };
 
-        template <typename T>
-        struct local_reference_identity
-        {
-            typedef local_reference<T> type;
-        };
-
-        template <typename Locals, typename Index>
-        struct make_local_reference
-        {
-            typedef typename
-                fusion::result_of::value_at<Locals, Index>::type
-            value_at;
-
-            typedef typename
-                mpl::eval_if<
-                    is_reference<value_at>
-                  , mpl::identity<value_at>
-                  , local_reference_identity<value_at>
-                >::type
-            type;
-        };
-
         template <typename Locals, typename Index>
         struct get_local_or_void
         {
             typedef typename
                 mpl::eval_if<
                     mpl::less<Index, mpl::size<Locals> >
-                  , make_local_reference<Locals, Index>
+                  , fusion::result_of::at<Locals, Index>
                   , mpl::identity<fusion::void_>
                 >::type
             type;

Modified: trunk/boost/spirit/home/phoenix/scope/local_variable.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/scope/local_variable.hpp	(original)
+++ trunk/boost/spirit/home/phoenix/scope/local_variable.hpp	2008-10-04 08:32:19 EDT (Sat, 04 Oct 2008)
@@ -36,7 +36,7 @@
         struct result : detail::apply_local<local_variable<Key>, Env> {};
 
         template <typename Env>
-        typename result<Env>::type const
+        typename result<Env>::type 
         eval(Env const& env) const
         {
             typedef typename result<Env>::type return_type;