Ticket #3780: boost-function-convert-reinterpret_cast-gcc-system-header.diff

boost/function/function_base.hpp

@@ -2 +2 @@
 
 //  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)
@@ -44 +45 @@
 #   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
@@ -314 +322 @@
         {
           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 detail::sp_typeinfo& check_type 
               = *out_buffer.type.type;
@@ -714 +722 @@
 
 public: // should be protected, but GCC 2.95.3 will fail to allow access
   detail::function::vtable_base* get_vtable() const {
-    return reinterpret_cast<detail::function::vtable_base*>(
-             reinterpret_cast<std::size_t>(vtable) & ~(std::size_t)0x01);
+    return static_cast<detail::function::vtable_base*>(
+            (void*)(
+             (std::size_t(static_cast<void*>(vtable)) & ~(std::size_t(0x01)))
+             )
+            );
   }
 
   bool has_trivial_copy_and_destroy() const {