From b618c3d0693aec564c6746238fd05d94e31d3b76 Mon Sep 17 00:00:00 2001 From: Parabola Date: Tue, 3 Apr 2012 14:54:55 +0000 Subject: Tue Apr 3 14:54:45 UTC 2012 --- extra/boost/BOOST_FOREACH.patch | 60 ----------------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 extra/boost/BOOST_FOREACH.patch (limited to 'extra/boost') diff --git a/extra/boost/BOOST_FOREACH.patch b/extra/boost/BOOST_FOREACH.patch deleted file mode 100644 index 12cf08800..000000000 --- a/extra/boost/BOOST_FOREACH.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: /trunk/boost/foreach_fwd.hpp -=================================================================== ---- /trunk/boost/foreach_fwd.hpp (revision 62661) -+++ /trunk/boost/foreach_fwd.hpp (revision 75540) -@@ -15,4 +15,6 @@ - #define BOOST_FOREACH_FWD_HPP - -+#include // for std::pair -+ - // This must be at global scope, hence the uglified name - enum boost_foreach_argument_dependent_lookup_hack -@@ -26,4 +28,7 @@ - namespace foreach - { -+ template -+ std::pair in_range(T begin, T end); -+ - /////////////////////////////////////////////////////////////////////////////// - // boost::foreach::tag -@@ -47,4 +52,22 @@ - } // namespace foreach - -+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131 -+namespace BOOST_FOREACH -+{ -+ using foreach::in_range; -+ using foreach::tag; -+ -+ template -+ struct is_lightweight_proxy -+ : foreach::is_lightweight_proxy -+ {}; -+ -+ template -+ struct is_noncopyable -+ : foreach::is_noncopyable -+ {}; -+ -+} // namespace BOOST_FOREACH -+ - } // namespace boost - -Index: /trunk/boost/foreach.hpp -=================================================================== ---- /trunk/boost/foreach.hpp (revision 75077) -+++ /trunk/boost/foreach.hpp (revision 75540) -@@ -166,5 +166,5 @@ - // at the global namespace for your type. - template --inline boost::foreach::is_lightweight_proxy * -+inline boost::BOOST_FOREACH::is_lightweight_proxy * - boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } - -@@ -191,5 +191,5 @@ - // at the global namespace for your type. - template --inline boost::foreach::is_noncopyable * -+inline boost::BOOST_FOREACH::is_noncopyable * - boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } - -- cgit v1.2.3-54-g00ecf