forked from pool/boost
Accepting request 36853 from home:Freespacer:branches:devel:libraries:c_c++
Copy from home:Freespacer:branches:devel:libraries:c_c++/boost via accept of submit request 36853 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/36853 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=18
This commit is contained in:
committed by
Git OBS Bridge
parent
84da53b20c
commit
503e2106d4
@@ -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;
|
||||
Reference in New Issue
Block a user