mirror of
https://github.com/boostorg/python.git
synced 2026-01-29 07:42:36 +00:00
changes from branch merged to enable cxx 6.51 compilations
[SVN r15716]
This commit is contained in:
@@ -96,7 +96,7 @@ struct rvalue_from_python_data : rvalue_from_python_storage<T>
|
||||
&& (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 245) \
|
||||
&& (!defined(__DECCXX_VER) || __DECCXX_VER > 60590014)
|
||||
// This must always be a POD struct with m_data its first member.
|
||||
BOOST_STATIC_ASSERT(offsetof(rvalue_from_python_storage<T>,stage1) == 0);
|
||||
BOOST_STATIC_ASSERT(BOOST_PYTHON_OFFSETOF(rvalue_from_python_storage<T>,stage1) == 0);
|
||||
# endif
|
||||
|
||||
// The usual constructor
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
# define BOOST_PYTHON_EXPORT_CLASS_TEMPLATE(instantiation) struct ThIsTyPeNeVeRuSeD
|
||||
#endif
|
||||
|
||||
#if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590014)
|
||||
#if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031)
|
||||
// Replace broken Tru64/cxx offsetof macro
|
||||
# define BOOST_PYTHON_OFFSETOF(s_name, s_member) \
|
||||
((size_t)__INTADDR__(&(((s_name *)0)->s_member)))
|
||||
|
||||
@@ -27,7 +27,7 @@ struct is_string_literal<char const[n]>
|
||||
BOOST_STATIC_CONSTANT(bool, value = true);
|
||||
};
|
||||
|
||||
# if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590014) \
|
||||
# if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) \
|
||||
|| (defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
|
||||
// This compiler mistakenly gets the type of string literals as char*
|
||||
// instead of char[NN].
|
||||
|
||||
Reference in New Issue
Block a user