[Boost-commit] svn:boost r77416 - trunk/boost

Subject: [Boost-commit] svn:boost r77416 - trunk/boost
From: eric_at_[hidden]
Date: 2012-03-19 16:50:44

Author: eric_niebler
Date: 2012-03-19 16:50:43 EDT (Mon, 19 Mar 2012)
New Revision: 77416
URL: http://svn.boost.org/trac/boost/changeset/77416

Log:
reverting [75540] which seemed to make things worse
Text files modified: 
   trunk/boost/foreach.hpp     |     4 ++--                                    
   trunk/boost/foreach_fwd.hpp |    23 -----------------------                 
   2 files changed, 2 insertions(+), 25 deletions(-)

Modified: trunk/boost/foreach.hpp
==============================================================================
--- trunk/boost/foreach.hpp	(original)
+++ trunk/boost/foreach.hpp	2012-03-19 16:50:43 EDT (Mon, 19 Mar 2012)
@@ -165,7 +165,7 @@
 //   this one works on legacy compilers. Overload boost_foreach_is_lightweight_proxy
 //   at the global namespace for your type.
 template<typename T>
-inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
+inline boost::foreach::is_lightweight_proxy<T> *
 boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
 
 template<typename T>
@@ -190,7 +190,7 @@
 //   this one works on legacy compilers. Overload boost_foreach_is_noncopyable
 //   at the global namespace for your type.
 template<typename T>
-inline boost::BOOST_FOREACH::is_noncopyable<T> *
+inline boost::foreach::is_noncopyable<T> *
 boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
 
 namespace boost

Modified: trunk/boost/foreach_fwd.hpp
==============================================================================
--- trunk/boost/foreach_fwd.hpp	(original)
+++ trunk/boost/foreach_fwd.hpp	2012-03-19 16:50:43 EDT (Mon, 19 Mar 2012)
@@ -14,8 +14,6 @@
 #ifndef BOOST_FOREACH_FWD_HPP
 #define BOOST_FOREACH_FWD_HPP
 
-#include <utility> // for std::pair
-
 // This must be at global scope, hence the uglified name
 enum boost_foreach_argument_dependent_lookup_hack
 {
@@ -27,9 +25,6 @@
 
 namespace foreach
 {
-    template<typename T>
-    std::pair<T, T> in_range(T begin, T end);
-
     ///////////////////////////////////////////////////////////////////////////////
     // boost::foreach::tag
     //
@@ -51,24 +46,6 @@
 
 } // namespace foreach
 
-// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
-namespace BOOST_FOREACH
-{
-    using foreach::in_range;
-    using foreach::tag;
-
-    template<typename T>
-    struct is_lightweight_proxy
-      : foreach::is_lightweight_proxy<T>
-    {};
-
-    template<typename T>
-    struct is_noncopyable
-      : foreach::is_noncopyable<T>
-    {};
-
-} // namespace BOOST_FOREACH
-
 } // namespace boost
 
 #endif