diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
| commit | 52dce173df6bbcc79126c63a7736ef3f6c21a706 (patch) | |
| tree | e7db4667113b04aa70bb9a59fa58e11f47be1ce5 | |
| parent | 0636f639785eda8b058488f8b0ef20ac51027dbf (diff) | |
| parent | af18c4a3e9e558615efca805190eaa961519e5fa (diff) | |
CWS-TOOLING: integrate CWS cmcfixes77
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m87
| -rw-r--r-- | boost/aliasing.patch | 43 | ||||
| -rw-r--r-- | boost/makefile.mk | 2 |
2 files changed, 45 insertions, 0 deletions
diff --git a/boost/aliasing.patch b/boost/aliasing.patch new file mode 100644 index 000000000000..8e3dc4107344 --- /dev/null +++ b/boost/aliasing.patch @@ -0,0 +1,43 @@ +--- misc/boost_1_39_0/boost/function/function_base.hpp ++++ misc/build/boost_1_39_0/boost/function/function_base.hpp +@@ -2,6 +2,7 @@ + + // Copyright Douglas Gregor 2001-2006 + // Copyright Emil Dotchevski 2007 ++// Copyright Dean Michael Berris 2009 + // Use, modification and distribution is subject to the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) +@@ -41,6 +42,13 @@ + # pragma warning( disable : 4127 ) // "conditional expression is constant" + #endif + ++#if defined(__GNUC__) ++// Because GCC complains of strict aliasing problems, we make it ++// treat the header as a system header, becoming more forgiving with ++// treating implementation details that may be potentially harmful. ++# pragma GCC system_header ++#endif ++ + // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. + #ifdef BOOST_NO_STD_TYPEINFO + // Embedded VC++ does not have type_info in namespace std +@@ -303,15 +311,15 @@ + { + 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 ((void*)&out_buffer.data) functor_type(*in_functor); + + if (op == move_functor_tag) { +- reinterpret_cast<functor_type*>(&in_buffer.data)->~Functor(); ++ static_cast<functor_type*>(static_cast<void*>(&in_buffer.data))->~Functor(); + } + } else if (op == destroy_functor_tag) { + // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type. +- reinterpret_cast<functor_type*>(&out_buffer.data)->~Functor(); ++ static_cast<functor_type*>(static_cast<void*>(&out_buffer.data))->~Functor(); + } else if (op == check_functor_type_tag) { + const BOOST_FUNCTION_STD_NS::type_info& check_type + = *out_buffer.type.type; diff --git a/boost/makefile.mk b/boost/makefile.mk index fdc1dfd2a44c..4a52cb08c3a5 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -51,6 +51,8 @@ all: TARFILE_NAME=boost_1_39_0 TARFILE_MD5=fcc6df1160753d0b8c835d17fdeeb0a7 PATCH_FILES=$(TARFILE_NAME).patch +# See https://svn.boost.org/trac/boost/ticket/3780 +PATCH_FILES+=aliasing.patch CONFIGURE_DIR= CONFIGURE_ACTION= |