diff options
author | adam <adam@pkgsrc.org> | 2012-07-03 19:46:30 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2012-07-03 19:46:30 +0000 |
commit | 7975c4f79a6a91ca390fb913e756ed0a4a0cf036 (patch) | |
tree | 6575ddfa4af537d67a4fb1e23cf07c4b8cd6a96a /meta-pkgs | |
parent | d997035f6e1756cafeda07c92fcd4cbf0c320186 (diff) | |
download | pkgsrc-7975c4f79a6a91ca390fb913e756ed0a4a0cf036.tar.gz |
Bring 'forach' patches back to life as they are still necessary
Diffstat (limited to 'meta-pkgs')
-rw-r--r-- | meta-pkgs/boost/distinfo | 4 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-boost_foreach.hpp | 24 | ||||
-rw-r--r-- | meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp | 48 |
3 files changed, 75 insertions, 1 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 556c69a0e32..9cdbd7f3180 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2012/07/02 07:02:26 adam Exp $ +$NetBSD: distinfo,v 1.45 2012/07/03 19:46:30 adam Exp $ SHA1 (boost_1_50_0.tar.bz2) = ee06f89ed472cf369573f8acf9819fbc7173344e RMD160 (boost_1_50_0.tar.bz2) = 72e33875d768def47acb5ba8222da4fa56780bab @@ -12,4 +12,6 @@ SHA1 (patch-ag) = c406e9beb9260db7861b13a6eb4c386f23346eb1 SHA1 (patch-ai) = 231db48819aa563b2082d95bb91d662b5d6cf779 SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3 +SHA1 (patch-boost_foreach.hpp) = 7cd26c4983873bcac284ad400950e341c559f9a8 +SHA1 (patch-boost_foreach_fwd.hpp) = 5accd68d559213a9677f7d1204e72dd082a42a41 SHA1 (patch-libs_signals_src_named_slot_map.cpp) = 42119b98857eb7e96ea29ac85c184eed46965295 diff --git a/meta-pkgs/boost/patches/patch-boost_foreach.hpp b/meta-pkgs/boost/patches/patch-boost_foreach.hpp new file mode 100644 index 00000000000..0f5a8bbf5b6 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_foreach.hpp @@ -0,0 +1,24 @@ +$NetBSD: patch-boost_foreach.hpp,v 1.3 2012/07/03 19:46:30 adam Exp $ + +https://svn.boost.org/trac/boost/ticket/6131 + +--- boost/foreach.hpp.orig 2012-01-09 15:55:10.000000000 +0000 ++++ boost/foreach.hpp +@@ -165,7 +165,7 @@ namespace foreach + // this one works on legacy compilers. Overload boost_foreach_is_lightweight_proxy + // at the global namespace for your type. + template<typename T> +-inline boost::foreach::is_lightweight_proxy<T> * ++inline boost::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 @@ boost_foreach_is_lightweight_proxy(T **& + // this one works on legacy compilers. Overload boost_foreach_is_noncopyable + // at the global namespace for your type. + template<typename T> +-inline boost::foreach::is_noncopyable<T> * ++inline boost::BOOST_FOREACH::is_noncopyable<T> * + boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } + + namespace boost diff --git a/meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp b/meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp new file mode 100644 index 00000000000..fcfd15ac3bf --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp @@ -0,0 +1,48 @@ +$NetBSD: patch-boost_foreach_fwd.hpp,v 1.3 2012/07/03 19:46:30 adam Exp $ + +https://svn.boost.org/trac/boost/ticket/6131 + +--- boost/foreach_fwd.hpp.orig 2012-01-09 15:58:44.000000000 +0000 ++++ boost/foreach_fwd.hpp +@@ -14,6 +14,8 @@ + #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 + { +@@ -25,6 +27,9 @@ namespace boost + + namespace foreach + { ++ template<typename T> ++ std::pair<T, T> in_range(T begin, T end); ++ + /////////////////////////////////////////////////////////////////////////////// + // boost::foreach::tag + // +@@ -46,6 +51,22 @@ namespace foreach + + } // namespace foreach + ++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 |