From 4258f82e1aecdc6bb91a6ea05ce8ac549849a63a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 30 Dec 2013 18:25:28 +0100 Subject: boost: bump to version 1.55.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ilation-of-Boost.Variants-move-assignment.patch | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch (limited to 'package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch') diff --git a/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch b/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch deleted file mode 100644 index 00dc7c619a..0000000000 --- a/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix compilation of Boost.Variants move assignment for situations when one of the variant template classes has nothrow copy constructor and throwing move constructor (refs #8772) - -Fixes compilation error: - -.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp: In member function 'void boost::variant::move_assigner::internal_visit(RhsT&, int) [with RhsT = boost::shared_ptr, T0_ = boost::shared_ptr, T1 = boost::signals2::detail::foreign_void_shared_ptr, T2 = boost::detail::variant::void_, ..., T18 = boost::detail::variant::void_, T19 = boost::detail::variant::void_]': -... -.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp:2058:13: error: no matching function for call to 'boost::variant, boost::signals2::detail::foreign_void_shared_ptr>::move_assigner::assign_impl(boost::shared_ptr&, nothrow_copy, nothrow_move_constructor, boost::variant, boost::signals2::detail::foreign_void_shared_ptr>::has_fallback_type_)' - -Reported here: https://svn.boost.org/trac/boost/ticket/8772 - -Signed-off-by: Luca Ceresoli -Backported-from: https://svn.boost.org/trac/boost/changeset/85080 - ---- a/boost/variant/variant.hpp (revision 85079) -+++ b/boost/variant/variant.hpp (revision 85080) -@@ -1981,5 +1981,5 @@ - private: // helpers, for internal visitor interface (below) - -- template -+ template - void assign_impl( - RhsT& rhs_content ---- a/libs/variant/test/rvalue_test.cpp (revision 85079) -+++ b/libs/variant/test/rvalue_test.cpp (revision 85080) -@@ -197,4 +197,19 @@ - #endif - -+struct nothrow_copyable_throw_movable { -+ nothrow_copyable_throw_movable(){} -+ nothrow_copyable_throw_movable(const nothrow_copyable_throw_movable&) BOOST_NOEXCEPT {} -+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES -+ nothrow_copyable_throw_movable(nothrow_copyable_throw_movable&&) BOOST_NOEXCEPT_IF(false) {} -+#endif -+}; -+ -+// This test is created to cover the following situation: -+// https://svn.boost.org/trac/boost/ticket/8772 -+void run_tricky_compilation_test() -+{ -+ boost::variant v; -+ v = nothrow_copyable_throw_movable(); -+} - - int test_main(int , char* []) -@@ -204,4 +219,5 @@ - run_move_only(); - run_moves_are_noexcept(); -+ run_tricky_compilation_test(); - return 0; - } -- cgit v1.2.3