diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-18 16:25:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-18 16:25:10 +0100 |
| commit | 4ec08e93f68c9446c64d133f7ca44e4210707841 (patch) | |
| tree | 8b8c905a6c88fb1602c8f67239659254207a69f6 /boost | |
| parent | 947c04111a1371955f6fee367d3dd6828a887b60 (diff) | |
tweak this to patch
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/aliasing.patch | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/boost/aliasing.patch b/boost/aliasing.patch index ce6baaf0dbe4..07840a445b10 100644 --- a/boost/aliasing.patch +++ b/boost/aliasing.patch @@ -1,5 +1,5 @@ ---- misc/boost_1_43_0/boost/function/function_base.hpp -+++ misc/build/boost_1_43_0/boost/function/function_base.hpp +--- 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 @@ -41,17 +41,3 @@ } else if (op == check_functor_type_tag) { const detail::sp_typeinfo& check_type = *out_buffer.type.type; -@@ -714,8 +722,11 @@ - - 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 { |