Files
libreoffice/boost/boost.3780.aliasing.patch
Tor Lillqvist f60af9ca6b Use a maximum fuzz factor of 1 for our patches to 3rd-party code
Change-Id: Id4639f1b0eefe5d433c84f48b7a1093fa17a3ba4
2013-05-27 16:39:41 +03:00

24 lines
1.3 KiB
Diff

--- misc/boost_1_44_0/boost/function/function_base.hpp
+++ misc/build/boost_1_44_0/boost/function/function_base.hpp
@@ -314,17 +322,17 @@
{
if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor =
- reinterpret_cast<const functor_type*>(&in_buffer.data);
+ static_cast<const functor_type*>(static_cast<void*>(&in_buffer.data));
new (reinterpret_cast<void*>(&out_buffer.data)) functor_type(*in_functor);
if (op == move_functor_tag) {
- functor_type* f = reinterpret_cast<functor_type*>(&in_buffer.data);
+ functor_type* f = static_cast<functor_type*>(static_cast<void*>(&in_buffer.data));
(void)f; // suppress warning about the value of f not being used (MSVC)
f->~Functor();
}
} else if (op == destroy_functor_tag) {
// Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
- functor_type* f = reinterpret_cast<functor_type*>(&out_buffer.data);
+ functor_type* f = static_cast<functor_type*>(static_cast<void*>(&out_buffer.data));
(void)f; // suppress warning about the value of f not being used (MSVC)
f->~Functor();
} else if (op == check_functor_type_tag) {