feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

#2019: Intrusive lists seem to return invalid references with member hooks in 64 bit mode on calling front/back

Browse Source 
[SVN r46511]
This commit is contained in:
Ion Gaztañaga
2008-06-19 14:29:52 +00:00
parent 6ba7360fba
commit 1c6d460167
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/intrusive/detail/parent_from_member.hpp
View File

@@ -16,6 +16,11 @@
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <cstddef> #include <cstddef>
#if defined(BOOST_MSVC) || (defined (BOOST_WINDOWS) && defined(BOOST_INTEL))
#define BOOST_INTRUSIVE_OFFSET_FROM_PTR2MEMBER_MSVC_COMPLIANT
#include <boost/cstdint.hpp>
#endif
namespace boost { namespace boost {
namespace intrusive { namespace intrusive {
namespace detail { namespace detail {
@@ -23,11 +28,10 @@ namespace detail {
template<class Parent, class Member> template<class Parent, class Member>
inline std::size_t offset_from_pointer_to_member(const Member Parent::* ptr_to_member) inline std::size_t offset_from_pointer_to_member(const Member Parent::* ptr_to_member)
{ {
//BOOST_STATIC_ASSERT(( sizeof(std::ptrdiff_t) == sizeof(ptr_to_member) ));
//The implementation of a pointer to member is compiler dependent. //The implementation of a pointer to member is compiler dependent.
#if defined(BOOST_MSVC) || (defined (BOOST_WINDOWS) && defined(BOOST_INTEL)) #if defined(BOOST_INTRUSIVE_OFFSET_FROM_PTR2MEMBER_MSVC_COMPLIANT)
//This works with gcc, msvc, ac++, ibmcpp //This works with gcc, msvc, ac++, ibmcpp
return *(const std::ptrdiff_t*)(void*)&ptr_to_member; return *(const boost::int32_t*)(void*)&ptr_to_member;
#elif defined(__GNUC__) || defined(__HP_aCC) || defined(BOOST_INTEL) || defined (__IBMCPP__) || defined (__DECCXX) #elif defined(__GNUC__) || defined(__HP_aCC) || defined(BOOST_INTEL) || defined (__IBMCPP__) || defined (__DECCXX)
const Parent * const parent = 0; const Parent * const parent = 0;
const char *const member = reinterpret_cast<const char*>(&(parent->*ptr_to_member)); const char *const member = reinterpret_cast<const char*>(&(parent->*ptr_to_member));
@@ -56,6 +60,10 @@ inline const Parent *parent_from_member(const Member *member, const Member Paren
} //namespace intrusive { } //namespace intrusive {
} //namespace boost { } //namespace boost {
#ifdef BOOST_INTRUSIVE_OFFSET_FROM_PTR2MEMBER_MSVC_COMPLIANT
#undef BOOST_INTRUSIVE_OFFSET_FROM_PTR2MEMBER_MSVC_COMPLIANT
#endif
#include <boost/intrusive/detail/config_end.hpp> #include <boost/intrusive/detail/config_end.hpp>
#endif //#ifndef BOOST_INTRUSIVE_PARENT_FROM_MEMBER_HPP #endif //#ifndef BOOST_INTRUSIVE_PARENT_FROM_MEMBER_HPP