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

static assert when complex pointer to member pointer must be used in MSVC in parent_from_member.

Browse Source 
[SVN r84338]
This commit is contained in:
Ion Gaztañaga
2013-05-18 09:41:39 +00:00
parent 5c9800ba64
commit 02506df225
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,9 @@
#include <cstddef> #include <cstddef>
#if defined(BOOST_MSVC) || ((defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && defined(BOOST_INTEL)) #if defined(BOOST_MSVC) || ((defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && defined(BOOST_INTEL))
#define BOOST_INTRUSIVE_MSVC_ABI_PTR_TO_MEMBER
#define BOOST_INTRUSIVE_MSVC_COMPLIANT_PTR_TO_MEMBER #include <boost/cstdint.hpp>
#include <boost/cstdint.hpp> #include <boost/static_assert.hpp>
#endif #endif
namespace boost { namespace boost {
@@ -29,7 +29,7 @@ template<class Parent, class Member>
inline std::ptrdiff_t offset_from_pointer_to_member(const Member Parent::* ptr_to_member) inline std::ptrdiff_t offset_from_pointer_to_member(const Member Parent::* 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_INTRUSIVE_MSVC_COMPLIANT_PTR_TO_MEMBER) #if defined(BOOST_INTRUSIVE_MSVC_ABI_PTR_TO_MEMBER)
//msvc compliant compilers use their the first 32 bits as offset (even in 64 bit mode) //msvc compliant compilers use their the first 32 bits as offset (even in 64 bit mode)
union caster_union union caster_union
{ {
@@ -37,6 +37,10 @@ inline std::ptrdiff_t offset_from_pointer_to_member(const Member Parent::* ptr_t
boost::int32_t offset; boost::int32_t offset;
} caster; } caster;
caster.ptr_to_member = ptr_to_member; caster.ptr_to_member = ptr_to_member;
//MSVC ABI can use up to 3 int32 to represent pointer to member data
//with virtual base classes, in those cases there is no simple to
//obtain the address of parent. So static assert to avoid runtime errors
BOOST_STATIC_ASSERT( sizeof(caster) == sizeof(boost::int32_t) );
return std::ptrdiff_t(caster.offset); return std::ptrdiff_t(caster.offset);
//This works with gcc, msvc, ac++, ibmcpp //This works with gcc, msvc, ac++, ibmcpp
#elif defined(__GNUC__) || defined(__HP_aCC) || defined(BOOST_INTEL) || \ #elif defined(__GNUC__) || defined(__HP_aCC) || defined(BOOST_INTEL) || \
@@ -84,8 +88,8 @@ inline const Parent *parent_from_member(const Member *member, const Member Paren
} //namespace intrusive { } //namespace intrusive {
} //namespace boost { } //namespace boost {
#ifdef BOOST_INTRUSIVE_MSVC_COMPLIANT_PTR_TO_MEMBER #ifdef BOOST_INTRUSIVE_MSVC_ABI_PTR_TO_MEMBER
#undef BOOST_INTRUSIVE_MSVC_COMPLIANT_PTR_TO_MEMBER #undef BOOST_INTRUSIVE_MSVC_ABI_PTR_TO_MEMBER
#endif #endif
#include <boost/intrusive/detail/config_end.hpp> #include <boost/intrusive/detail/config_end.hpp>