Ticket #4476: function.patch

boost/function/function_base.hpp

@@ -711 +711 @@
       else return true;
     }
 #endif
+private:
+  #if defined(__VMS) && __INITIAL_POINTER_SIZE==64
+  typedef unsigned long long uintptr_type;
+  #else
+  typedef std::size_t uintptr_type;
+  #endif
 
 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);
+             reinterpret_cast<uintptr_type>(vtable) & ~(uintptr_type)0x01);
   }
 
   bool has_trivial_copy_and_destroy() const {
-    return reinterpret_cast<std::size_t>(vtable) & 0x01;
+    return (reinterpret_cast<uintptr_type>(vtable) & 0x01)!=0;
   }
 
   detail::function::vtable_base* vtable;

boost/function/function_template.hpp

@@ -674 +674 @@
     typedef boost::detail::function::BOOST_FUNCTION_VTABLE<
               R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS>
       vtable_type;
+    #if defined(__VMS) && __INITIAL_POINTER_SIZE == 64
+    typedef unsigned long long uintptr_type;
+    #else
+    typedef std::size_t uintptr_type;
+    #endif
 
     vtable_type* get_vtable() const {
       return reinterpret_cast<vtable_type*>(
-               reinterpret_cast<std::size_t>(vtable) & ~(std::size_t)0x01);
+               reinterpret_cast<uintptr_type>(vtable) & ~(uintptr_type)0x01);
     }
 
     struct clear_type {};
@@ -913 +918 @@
         { { &manager_type::manage }, &invoker_type::invoke };
 
       if (stored_vtable.assign_to(f, functor)) {
-        std::size_t value = reinterpret_cast<std::size_t>(&stored_vtable.base);
+        uintptr_type value = reinterpret_cast<uintptr_type>(&stored_vtable.base);
         if (boost::has_trivial_copy_constructor<Functor>::value &&
             boost::has_trivial_destructor<Functor>::value &&
             detail::function::function_allows_small_object_optimization<Functor>::value)
-          value |= (std::size_t)0x01;
+          value |= (uintptr_type)0x01;
         vtable = reinterpret_cast<detail::function::vtable_base *>(value);
       } else 
         vtable = 0;
@@ -947 +952 @@
         { { &manager_type::manage }, &invoker_type::invoke };
 
       if (stored_vtable.assign_to_a(f, functor, a)) { 
-        std::size_t value = reinterpret_cast<std::size_t>(&stored_vtable.base);
+        uintptr_type value = reinterpret_cast<uintptr_type>(&stored_vtable.base);
         if (boost::has_trivial_copy_constructor<Functor>::value &&
             boost::has_trivial_destructor<Functor>::value &&
             detail::function::function_allows_small_object_optimization<Functor>::value)
-          value |= (std::size_t)0x01;
+          value |= (uintptr_type)0x01;
         vtable = reinterpret_cast<detail::function::vtable_base *>(value);
       } else 
         vtable = 0;