[Boost-commit] svn:boost r48923 - in branches/proto/v4/boost/phoenix: core stl/container

Subject: [Boost-commit] svn:boost r48923 - in branches/proto/v4/boost/phoenix: core stl/container
From: eric_at_[hidden]
Date: 2008-09-23 02:01:33

Author: eric_niebler
Date: 2008-09-23 02:01:32 EDT (Tue, 23 Sep 2008)
New Revision: 48923
URL: http://svn.boost.org/trac/boost/changeset/48923

Log:
some msvc portability tweaks
Text files modified: 
   branches/proto/v4/boost/phoenix/core/value.hpp              |     4 +++-                                    
   branches/proto/v4/boost/phoenix/stl/container/container.hpp |     4 +++-                                    
   2 files changed, 6 insertions(+), 2 deletions(-)

Modified: branches/proto/v4/boost/phoenix/core/value.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/core/value.hpp	(original)
+++ branches/proto/v4/boost/phoenix/core/value.hpp	2008-09-23 02:01:32 EDT (Tue, 23 Sep 2008)
@@ -87,7 +87,9 @@
     struct extension<tag::byval, SubGrammar>
       : proto::when<
             proto::unary_expr<tag::byval, evaluator<SubGrammar> >
-          , remove_reference<evaluator<SubGrammar>(proto::_child)>(evaluator<SubGrammar>(proto::_child))
+          , remove_reference<evaluator<SubGrammar>(proto::_child)>(
+                proto::call<evaluator<SubGrammar>(proto::_child)>
+            )
         >
     {};
 

Modified: branches/proto/v4/boost/phoenix/stl/container/container.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/stl/container/container.hpp	(original)
+++ branches/proto/v4/boost/phoenix/stl/container/container.hpp	2008-09-23 02:01:32 EDT (Tue, 23 Sep 2008)
@@ -8,6 +8,8 @@
 #ifndef PHOENIX_STL_CONTAINER_CONTAINER_HPP
 #define PHOENIX_STL_CONTAINER_CONTAINER_HPP
 
+#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 #include <boost/phoenix/core/limits.hpp>
 
 #if (PHOENIX_LIMIT < 5)
@@ -329,7 +331,7 @@
                 typedef
                     boost::mpl::eval_if<
                         boost::is_same<arg1, typename iterator_of<container>::type>
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
+#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, <= 313) || (0 == _HAS_STRICT_CONFORMANCE)
                       , iterator_of<container>
 #else
                       , boost::mpl::identity<void>