From 7d66a2e01773be32f6bc7ab39515a9a15f208bb13a11f30d9c6d52f671b9701b Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 26 Apr 2010 10:35:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=21 --- boost-add_timer_canceling_test.patch | 38 --- boost-fix_hash_resizing.patch | 15 -- boost-fix_ifdefs.patch | 344 ------------------------- boost-function_without_exception.patch | 17 -- boost-visit_each.patch | 12 - boost.changes | 5 + 6 files changed, 5 insertions(+), 426 deletions(-) delete mode 100644 boost-add_timer_canceling_test.patch delete mode 100644 boost-fix_hash_resizing.patch delete mode 100644 boost-fix_ifdefs.patch delete mode 100644 boost-function_without_exception.patch delete mode 100644 boost-visit_each.patch diff --git a/boost-add_timer_canceling_test.patch b/boost-add_timer_canceling_test.patch deleted file mode 100644 index 3c429bb..0000000 --- a/boost-add_timer_canceling_test.patch +++ /dev/null @@ -1,38 +0,0 @@ -Add a test for timer canceling. - ---- libs/asio/test/deadline_timer.cpp -+++ libs/asio/test/deadline_timer.cpp -@@ -180,8 +180,33 @@ - } - -+void timer_handler(const boost::system::error_code&) -+{ -+} -+ -+void deadline_timer_cancel_test() -+{ -+ static boost::asio::io_service io_service; -+ struct timer -+ { -+ boost::asio::deadline_timer t; -+ timer() : t(io_service) { t.expires_at(boost::posix_time::pos_infin); } -+ } timers[50]; -+ -+ timers[2].t.async_wait(timer_handler); -+ timers[41].t.async_wait(timer_handler); -+ for (int i = 10; i < 20; ++i) -+ timers[i].t.async_wait(timer_handler); -+ -+ BOOST_CHECK(timers[2].t.cancel() == 1); -+ BOOST_CHECK(timers[41].t.cancel() == 1); -+ for (int i = 10; i < 20; ++i) -+ BOOST_CHECK(timers[i].t.cancel() == 1); -+} -+ - test_suite* init_unit_test_suite(int, char*[]) - { - test_suite* test = BOOST_TEST_SUITE("deadline_timer"); - test->add(BOOST_TEST_CASE(&deadline_timer_test)); -+ test->add(BOOST_TEST_CASE(&deadline_timer_cancel_test)); - return test; - } diff --git a/boost-fix_hash_resizing.patch b/boost-fix_hash_resizing.patch deleted file mode 100644 index fb62a0d..0000000 --- a/boost-fix_hash_resizing.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- boost/asio/detail/hash_map.hpp -+++ boost/asio/detail/hash_map.hpp -@@ -232,7 +232,11 @@ - buckets_[bucket].first = buckets_[bucket].last = iter++; - } -+ else if (++buckets_[bucket].last == iter) -+ { -+ ++iter; -+ } - else - { -- values_.splice(++buckets_[bucket].last, values_, iter++); -+ values_.splice(buckets_[bucket].last, values_, iter++); - --buckets_[bucket].last; - } diff --git a/boost-fix_ifdefs.patch b/boost-fix_ifdefs.patch deleted file mode 100644 index 70d14aa..0000000 --- a/boost-fix_ifdefs.patch +++ /dev/null @@ -1,344 +0,0 @@ -Index: boost/intrusive/hashtable.hpp -=================================================================== ---- boost/intrusive/hashtable.hpp.orig 2009-10-15 20:46:26.000000000 +0200 -+++ boost/intrusive/hashtable.hpp 2010-04-08 13:51:49.307002153 +0200 -@@ -570,6 +570,7 @@ template - #else - template - #endif -+ - class hashtable_impl - : private detail::clear_on_destructor_base > - { -@@ -2879,15 +2880,16 @@ template < class T - #else - template - #endif -+ - struct make_hashtable_opt - { - typedef typename pack_options - < uset_defaults, -- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) -+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4, O5, O6, O7, O8, O9, O10 -- #else -+#else - Options... -- #endif -+#endif - >::type packed_options; - - //Real value traits must be calculated from options -@@ -2947,17 +2949,18 @@ template - #endif -+ - struct make_hashtable - { - /// @cond - typedef hashtable_impl - < typename make_hashtable_opt - ::type - > implementation_defined; - -@@ -2972,21 +2975,22 @@ template - #else - template - #endif -+ - class hashtable - : public make_hashtable::type - { - typedef typename make_hashtable::type Base; - - public: -@@ -3011,7 +3015,7 @@ class hashtable - {} - }; - --#endif -+#endif // BOOST_INTRUSIVE_DOXYGEN_INVOKED - - } //namespace intrusive - } //namespace boost -Index: boost/intrusive/rbtree.hpp -=================================================================== ---- boost/intrusive/rbtree.hpp.orig 2009-10-15 20:46:26.000000000 +0200 -+++ boost/intrusive/rbtree.hpp 2010-04-08 13:55:55.579002923 +0200 -@@ -865,11 +865,11 @@ class rbtree_impl - return ret; - } - -- #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) -+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) - template - iterator erase_and_dispose(iterator i, Disposer disposer) - { return this->erase_and_dispose(const_iterator(i), disposer); } -- #endif -+#endif - - //! Requires: Disposer::operator()(pointer) shouldn't throw. - //! -@@ -1530,11 +1530,11 @@ struct make_rbtree_opt - { - typedef typename pack_options - < set_defaults, -- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) -+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4 -- #else -+#else - Options... -- #endif -+#endif - >::type packed_options; - typedef typename detail::get_value_traits - ::type value_traits; -@@ -1561,11 +1561,11 @@ struct make_rbtree - /// @cond - typedef rbtree_impl - < typename make_rbtree_opt::type - > implementation_defined; - /// @endcond -@@ -1581,20 +1581,20 @@ template - #endif - class rbtree - : public make_rbtree::type - { - typedef typename make_rbtree - ::type Base; - - public: -@@ -1632,7 +1632,7 @@ class rbtree - { return static_cast(Base::container_from_iterator(it)); } - }; - --#endif -+#endif //!BOOST_INTRUSIVE_VARIADIC_TEMPLATES - - - } //namespace intrusive -Index: boost/intrusive/sgtree.hpp -=================================================================== ---- boost/intrusive/sgtree.hpp.orig 2009-10-15 20:46:26.000000000 +0200 -+++ boost/intrusive/sgtree.hpp 2010-04-08 13:58:34.839825416 +0200 -@@ -1048,11 +1048,11 @@ class sgtree_impl - return ret; - } - -- #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) -+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) - template - iterator erase_and_dispose(iterator i, Disposer disposer) - { return this->erase_and_dispose(const_iterator(i), disposer); } -- #endif -+#endif - - //! Requires: Disposer::operator()(pointer) shouldn't throw. - //! -@@ -1770,11 +1770,11 @@ struct make_sgtree_opt - { - typedef typename pack_options - < sg_set_defaults, -- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) -+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4 -- #else -+#else - Options... -- #endif -+#endif - >::type packed_options; - typedef typename detail::get_value_traits - ::type value_traits; -@@ -1801,11 +1801,11 @@ struct make_sgtree - /// @cond - typedef sgtree_impl - < typename make_sgtree_opt::type - > implementation_defined; - /// @endcond -@@ -1820,20 +1820,20 @@ template - #endif - class sgtree - : public make_sgtree::type - { - typedef typename make_sgtree - ::type Base; - - public: -@@ -1865,7 +1865,7 @@ class sgtree - { return static_cast(Base::container_from_end_iterator(end_iterator)); } - }; - --#endif -+#endif //!BOOST_INTRUSIVE_DOXYGEN_INVOKED - - - } //namespace intrusive -Index: boost/intrusive/treap.hpp -=================================================================== ---- boost/intrusive/treap.hpp.orig 2009-10-15 20:46:26.000000000 +0200 -+++ boost/intrusive/treap.hpp 2010-04-08 14:00:00.043511275 +0200 -@@ -976,11 +976,11 @@ class treap_impl - return ret; - } - -- #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) -+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) - template - iterator erase_and_dispose(iterator i, Disposer disposer) - { return this->erase_and_dispose(const_iterator(i), disposer); } -- #endif -+#endif - - //! Requires: Disposer::operator()(pointer) shouldn't throw. - //! -@@ -1629,11 +1629,11 @@ struct make_treap_opt - { - typedef typename pack_options - < treap_set_defaults, -- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) -+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES) - O1, O2, O3, O4 -- #else -+#else - Options... -- #endif -+#endif - >::type packed_options; - typedef typename detail::get_value_traits - ::type value_traits; -@@ -1661,11 +1661,11 @@ struct make_trie - /// @cond - typedef treap_impl - < typename make_treap_opt::type - > implementation_defined; - /// @endcond -@@ -1681,20 +1681,20 @@ template - #endif - class treap - : public make_trie::type - { - typedef typename make_trie - ::type Base; - - public: -@@ -1735,7 +1735,7 @@ class treap - { return static_cast(Base::container_from_iterator(it)); } - }; - --#endif -+#endif // !BOOST_INTRUSIVE_DOXYGEN_INVOKED - - - } //namespace intrusive diff --git a/boost-function_without_exception.patch b/boost-function_without_exception.patch deleted file mode 100644 index 3360d77..0000000 --- a/boost-function_without_exception.patch +++ /dev/null @@ -1,17 +0,0 @@ -The ifdef is misplaced and leads to compilation errors when -when BOOST_NO_EXCEPTIONS is defined (bnc#479659). - ---- boost/function/function_template.hpp -+++ boost/function/function_template.hpp -@@ -950,10 +950,10 @@ - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; diff --git a/boost-visit_each.patch b/boost-visit_each.patch deleted file mode 100644 index 3b440d0..0000000 --- a/boost-visit_each.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup boost_1_42_0.orig/boost/visit_each.hpp boost_1_42_0/boost/visit_each.hpp ---- boost_1_42_0.orig/boost/visit_each.hpp 2010-04-03 00:03:31.834604103 +0200 -+++ boost_1_42_0/boost/visit_each.hpp 2010-04-03 00:57:04.831601617 +0200 -@@ -22,7 +22,7 @@ namespace boost { - template - inline void visit_each(Visitor& visitor, const T& t) - { -- visit_each(visitor, t, 0); -+ visit_each(visitor, t, (long)0); - } - } - diff --git a/boost.changes b/boost.changes index 2d5613d..fc5b8f9 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 26 10:34:26 UTC 2010 - pth@novell.com + +- Delete unneeded patches. + ------------------------------------------------------------------- Wed Apr 14 13:54:12 CEST 2010 - pth@suse.de