From e5fbe651d86bf51c5d07d96e73c4c3f70afc6920 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Fri, 4 Oct 2002 03:46:43 +0000
Subject: [PATCH] Tru64 CXX updates

[SVN r15704]
---
 include/boost/python/args.hpp                             | 7 -------
 include/boost/python/args_fwd.hpp                         | 8 +++++++-
 .../boost/python/converter/rvalue_from_python_data.hpp    | 2 +-
 include/boost/python/detail/config.hpp                    | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/boost/python/args.hpp b/include/boost/python/args.hpp
index 4e2e922b..9a5902ae 100644
--- a/include/boost/python/args.hpp
+++ b/include/boost/python/args.hpp
@@ -7,7 +7,6 @@
 # define KEYWORDS_DWA2002323_HPP
 
 # include <boost/python/args_fwd.hpp>
-# include <boost/python/handle.hpp>
 # include <boost/config.hpp>
 # include <boost/python/detail/preprocessor.hpp>
 # include <boost/python/detail/type_list.hpp>
@@ -32,12 +31,6 @@ namespace boost { namespace python {
 
 namespace detail
 {
-  struct keyword
-  {
-      char const* name;
-      handle<> default_value;
-  };
-  
   template <std::size_t nkeywords>
   struct keywords
   {
diff --git a/include/boost/python/args_fwd.hpp b/include/boost/python/args_fwd.hpp
index b8ca0c7d..e310f761 100644
--- a/include/boost/python/args_fwd.hpp
+++ b/include/boost/python/args_fwd.hpp
@@ -6,6 +6,7 @@
 #ifndef ARGS_FWD_DWA2002927_HPP
 # define ARGS_FWD_DWA2002927_HPP
 
+# include <boost/python/handle.hpp>
 # include <boost/config.hpp>
 # include <cstddef>
 # include <utility>
@@ -14,7 +15,12 @@ namespace boost { namespace python {
 
 namespace detail
 {
-  struct keyword;
+  struct keyword
+  {
+      char const* name;
+      handle<> default_value;
+  };
+  
   template <std::size_t nkeywords = 0> struct keywords;
   
   typedef std::pair<keyword const*, keyword const*> keyword_range;
diff --git a/include/boost/python/converter/rvalue_from_python_data.hpp b/include/boost/python/converter/rvalue_from_python_data.hpp
index 16c9d44b..7f512830 100644
--- a/include/boost/python/converter/rvalue_from_python_data.hpp
+++ b/include/boost/python/converter/rvalue_from_python_data.hpp
@@ -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 
diff --git a/include/boost/python/detail/config.hpp b/include/boost/python/detail/config.hpp
index 16948010..fb263dbe 100644
--- a/include/boost/python/detail/config.hpp
+++ b/include/boost/python/detail/config.hpp
@@ -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)))