Python 2.3 Tru64 cxx compatibility & a little cleanup

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit 4477fe4dd66a · 2003-06-03T02:58:43.000Z
[SVN r18652]
diff --git a/include/boost/python/arg_from_python.hpp b/include/boost/python/arg_from_python.hpp
@@ -6,6 +6,7 @@
 #ifndef ARG_FROM_PYTHON_DWA2002128_HPP
 # define ARG_FROM_PYTHON_DWA2002128_HPP
 
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/arg_from_python.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
 
diff --git a/include/boost/python/cast.hpp b/include/boost/python/cast.hpp
@@ -8,7 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/type_traits/same_traits.hpp>
 # include <boost/type_traits/cv_traits.hpp>
 # include <boost/type.hpp>
diff --git a/include/boost/python/converter/arg_from_python.hpp b/include/boost/python/converter/arg_from_python.hpp
@@ -6,8 +6,8 @@
 #ifndef ARG_FROM_PYTHON_DWA2002127_HPP
 # define ARG_FROM_PYTHON_DWA2002127_HPP
 
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/from_python.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/detail/indirect_traits.hpp>
 # include <boost/type_traits/transform_traits.hpp>
 # include <boost/type_traits/cv_traits.hpp>
diff --git a/include/boost/python/converter/arg_to_python_base.hpp b/include/boost/python/converter/arg_to_python_base.hpp
@@ -5,7 +5,6 @@
 // to its suitability for any purpose.
 #ifndef ARG_TO_PYTHON_BASE_DWA200237_HPP
 # define ARG_TO_PYTHON_BASE_DWA200237_HPP
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/handle.hpp>
 
 namespace boost { namespace python { namespace converter {
diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp
@@ -5,7 +5,7 @@
 // to its suitability for any purpose.
 #ifndef BUILTIN_CONVERTERS_DWA2002124_HPP
 # define BUILTIN_CONVERTERS_DWA2002124_HPP
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/detail/none.hpp>
 # include <boost/python/handle.hpp>
 # include <string>
diff --git a/include/boost/python/converter/from_python.hpp b/include/boost/python/converter/from_python.hpp
@@ -6,8 +6,7 @@
 #ifndef FIND_FROM_PYTHON_DWA2002223_HPP
 # define FIND_FROM_PYTHON_DWA2002223_HPP
 
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/rvalue_from_python_data.hpp>
 
 namespace boost { namespace python { namespace converter { 
diff --git a/include/boost/python/converter/obj_mgr_arg_from_python.hpp b/include/boost/python/converter/obj_mgr_arg_from_python.hpp
@@ -6,7 +6,7 @@
 #ifndef OBJ_MGR_ARG_FROM_PYTHON_DWA2002628_HPP
 # define OBJ_MGR_ARG_FROM_PYTHON_DWA2002628_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/detail/referent_storage.hpp>
 # include <boost/python/detail/destroy.hpp>
 # include <boost/python/detail/construct.hpp>
diff --git a/include/boost/python/converter/pyobject_traits.hpp b/include/boost/python/converter/pyobject_traits.hpp
@@ -6,7 +6,7 @@
 #ifndef PYOBJECT_TRAITS_DWA2002720_HPP
 # define PYOBJECT_TRAITS_DWA2002720_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/converter/pyobject_type.hpp>
 
 namespace boost { namespace python { namespace converter { 
diff --git a/include/boost/python/converter/pyobject_type.hpp b/include/boost/python/converter/pyobject_type.hpp
@@ -6,8 +6,6 @@
 #ifndef PYOBJECT_TYPE_DWA2002720_HPP
 # define PYOBJECT_TYPE_DWA2002720_HPP
 
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/cast.hpp>
 
 namespace boost { namespace python { namespace converter { 
diff --git a/include/boost/python/converter/pytype_arg_from_python.hpp b/include/boost/python/converter/pytype_arg_from_python.hpp
@@ -6,7 +6,7 @@
 #ifndef PYTYPE_ARG_FROM_PYTHON_DWA2002628_HPP
 # define PYTYPE_ARG_FROM_PYTHON_DWA2002628_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 
 //
 // arg_from_python converters for Python type wrappers, to be used as
diff --git a/include/boost/python/converter/pytype_object_mgr_traits.hpp b/include/boost/python/converter/pytype_object_mgr_traits.hpp
@@ -6,9 +6,9 @@
 #ifndef PYTYPE_OBJECT_MANAGER_TRAITS_DWA2002716_HPP
 # define PYTYPE_OBJECT_MANAGER_TRAITS_DWA2002716_HPP
 
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/detail/raw_pyobject.hpp>
 # include <boost/python/cast.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/converter/pyobject_type.hpp>
 # include <boost/python/errors.hpp>
 
diff --git a/include/boost/python/converter/registrations.hpp b/include/boost/python/converter/registrations.hpp
@@ -6,14 +6,14 @@
 #ifndef REGISTRATIONS_DWA2002223_HPP
 # define REGISTRATIONS_DWA2002223_HPP
 
+# include <boost/python/detail/prefix.hpp>
+
 # include <boost/python/type_id.hpp>
 
 # include <boost/python/converter/convertible_function.hpp>
 # include <boost/python/converter/constructor_function.hpp>
 # include <boost/python/converter/to_python_function_type.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
-
 # include <boost/detail/workaround.hpp>
 
 namespace boost { namespace python { namespace converter { 
diff --git a/include/boost/python/converter/registry.hpp b/include/boost/python/converter/registry.hpp
@@ -6,8 +6,6 @@
 #ifndef REGISTRY_DWA20011127_HPP
 # define REGISTRY_DWA20011127_HPP
 # include <boost/python/type_id.hpp>
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/converter/to_python_function_type.hpp>
 # include <boost/python/converter/rvalue_from_python_data.hpp>
 # include <boost/python/converter/constructor_function.hpp>
diff --git a/include/boost/python/converter/to_python_function_type.hpp b/include/boost/python/converter/to_python_function_type.hpp
@@ -5,7 +5,7 @@
 // to its suitability for any purpose.
 #ifndef TO_PYTHON_FUNCTION_TYPE_DWA200236_HPP
 # define TO_PYTHON_FUNCTION_TYPE_DWA200236_HPP
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/static_assert.hpp>
 
 namespace boost { namespace python { namespace converter { 
diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
@@ -18,8 +18,6 @@
 # include <boost/python/converter/builtin_converters.hpp>
 
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/detail/not_specified.hpp>
 
 # include <boost/type_traits/transform_traits.hpp>
diff --git a/include/boost/python/default_call_policies.hpp b/include/boost/python/default_call_policies.hpp
@@ -7,7 +7,6 @@
 # define DEFAULT_CALL_POLICIES_DWA2002131_HPP
 
 # include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/python/to_python_value.hpp>
 # include <boost/type_traits/transform_traits.hpp>
diff --git a/include/boost/python/detail/aix_init_module.hpp b/include/boost/python/detail/aix_init_module.hpp
@@ -6,7 +6,7 @@
 #ifndef AIX_INIT_MODULE_DWA2002529_HPP
 # define AIX_INIT_MODULE_DWA2002529_HPP
 # ifdef _AIX
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <cstdio>
 # ifdef __KCC
 #  include <iostream> // this works around a problem in KCC 4.0f
diff --git a/include/boost/python/detail/invoke.hpp b/include/boost/python/detail/invoke.hpp
@@ -8,7 +8,7 @@
 # ifndef INVOKE_DWA20021122_HPP
 #  define INVOKE_DWA20021122_HPP
 
-#  include <boost/python/detail/wrap_python.hpp>
+#  include <boost/python/detail/prefix.hpp>
 #  include <boost/python/detail/preprocessor.hpp>
 #  include <boost/python/detail/none.hpp>
 
diff --git a/include/boost/python/detail/none.hpp b/include/boost/python/detail/none.hpp
@@ -9,8 +9,7 @@
 #ifndef NONE_DWA_052000_H_
 # define NONE_DWA_052000_H_
 
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 
 namespace boost { namespace python { namespace detail {
 
diff --git a/include/boost/python/errors.hpp b/include/boost/python/errors.hpp
@@ -9,8 +9,7 @@
 #ifndef ERRORS_DWA052500_H_
 # define ERRORS_DWA052500_H_
 
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/function/function0.hpp>
 
 namespace boost { namespace python {
diff --git a/include/boost/python/handle.hpp b/include/boost/python/handle.hpp
@@ -8,7 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/cast.hpp>
 # include <boost/python/errors.hpp>
 # include <boost/python/borrowed.hpp>
diff --git a/include/boost/python/handle_fwd.hpp b/include/boost/python/handle_fwd.hpp
@@ -8,8 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
-
 namespace boost { namespace python { 
 
 template <class T = PyObject> class handle;
diff --git a/include/boost/python/instance_holder.hpp b/include/boost/python/instance_holder.hpp
@@ -8,7 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/config.hpp>
 # include <boost/utility.hpp>
 # include <boost/python/type_id.hpp>
 # include <cstddef>
diff --git a/include/boost/python/module_init.hpp b/include/boost/python/module_init.hpp
@@ -8,9 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/detail/config.hpp>
-
 # ifndef BOOST_PYTHON_MODULE_INIT
 
 namespace boost { namespace python { namespace detail {
diff --git a/include/boost/python/object.hpp b/include/boost/python/object.hpp
@@ -6,6 +6,7 @@
 #ifndef OBJECT_DWA2002612_HPP
 # define OBJECT_DWA2002612_HPP
 
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/object_core.hpp>
 # include <boost/python/object_attributes.hpp>
 # include <boost/python/object_items.hpp>
diff --git a/include/boost/python/object/add_to_namespace.hpp b/include/boost/python/object/add_to_namespace.hpp
@@ -6,7 +6,6 @@
 #ifndef ADD_TO_NAMESPACE_DWA200286_HPP
 # define ADD_TO_NAMESPACE_DWA200286_HPP
 
-# include <boost/python/detail/config.hpp>
 # include <boost/python/object_fwd.hpp>
 
 namespace boost { namespace python { namespace objects { 
diff --git a/include/boost/python/object/class.hpp b/include/boost/python/object/class.hpp
@@ -6,8 +6,7 @@
 #ifndef CLASS_DWA20011214_HPP
 # define CLASS_DWA20011214_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/detail/config.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/utility.hpp>
 # include <boost/python/instance_holder.hpp>
 # include <boost/python/object_core.hpp>
diff --git a/include/boost/python/object/function.hpp b/include/boost/python/object/function.hpp
@@ -6,9 +6,8 @@
 #ifndef FUNCTION_DWA20011214_HPP
 # define FUNCTION_DWA20011214_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/args_fwd.hpp>
-# include <boost/python/detail/config.hpp>
 # include <boost/python/handle.hpp>
 # include <boost/function/function2.hpp>
 # include <boost/python/object_core.hpp>
diff --git a/include/boost/python/object/function_object.hpp b/include/boost/python/object/function_object.hpp
@@ -5,7 +5,7 @@
 // to its suitability for any purpose.
 #ifndef FUNCTION_OBJECT_DWA2002725_HPP
 # define FUNCTION_OBJECT_DWA2002725_HPP
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/function/function2.hpp>
 # include <boost/python/object_core.hpp>
 # include <boost/python/args_fwd.hpp>
diff --git a/include/boost/python/object/instance.hpp b/include/boost/python/object/instance.hpp
@@ -6,7 +6,7 @@
 #ifndef INSTANCE_DWA200295_HPP
 # define INSTANCE_DWA200295_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/type_traits/alignment_traits.hpp>
 # include <cstddef>
 
diff --git a/include/boost/python/object/iterator_core.hpp b/include/boost/python/object/iterator_core.hpp
@@ -6,7 +6,6 @@
 #ifndef ITERATOR_CORE_DWA2002512_HPP
 # define ITERATOR_CORE_DWA2002512_HPP
 
-# include <boost/python/detail/config.hpp>
 # include <boost/python/object_fwd.hpp>
 
 namespace boost { namespace python { namespace objects {
diff --git a/include/boost/python/object/life_support.hpp b/include/boost/python/object/life_support.hpp
@@ -5,8 +5,7 @@
 // to its suitability for any purpose.
 #ifndef LIFE_SUPPORT_DWA200222_HPP
 # define LIFE_SUPPORT_DWA200222_HPP
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 
 namespace boost { namespace python { namespace objects { 
 
diff --git a/include/boost/python/object/make_holder.hpp b/include/boost/python/object/make_holder.hpp
@@ -9,10 +9,11 @@
 # ifndef MAKE_HOLDER_DWA20011215_HPP
 #  define MAKE_HOLDER_DWA20011215_HPP
 
+#  include <boost/python/detail/prefix.hpp>
+
 #  include <boost/python/object/instance.hpp>
 
 #  include <boost/python/object/forward.hpp>
-#  include <boost/python/detail/wrap_python.hpp>
 #  include <boost/python/detail/preprocessor.hpp>
 
 #  include <boost/mpl/next.hpp>
diff --git a/include/boost/python/object/make_instance.hpp b/include/boost/python/object/make_instance.hpp
@@ -6,7 +6,7 @@
 #ifndef MAKE_INSTANCE_DWA200296_HPP
 # define MAKE_INSTANCE_DWA200296_HPP
 
-# include <boost/python/detail/wrap_python.hpp>
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/object/instance.hpp>
 # include <boost/python/converter/registered.hpp>
 # include <boost/python/detail/decref_guard.hpp>
diff --git a/include/boost/python/object/pickle_support.hpp b/include/boost/python/object/pickle_support.hpp
@@ -6,7 +6,7 @@
 #ifndef BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
 # define BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
 
-# include <boost/python/detail/config.hpp>
+# include <boost/python/detail/prefix.hpp>
 
 namespace boost { namespace python {
 
diff --git a/include/boost/python/object_protocol.hpp b/include/boost/python/object_protocol.hpp
@@ -8,8 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/config.hpp>
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/object_protocol_core.hpp>
 # include <boost/python/object_core.hpp>
 
diff --git a/include/boost/python/object_protocol_core.hpp b/include/boost/python/object_protocol_core.hpp
@@ -8,7 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/config.hpp>
 # include <boost/python/handle_fwd.hpp>
 
 namespace boost { namespace python { 
diff --git a/include/boost/python/operators.hpp b/include/boost/python/operators.hpp
@@ -8,7 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/converter/arg_to_python.hpp>
 # include <boost/python/detail/operator_id.hpp>
 # include <boost/python/detail/not_specified.hpp>
diff --git a/include/boost/python/proxy.hpp b/include/boost/python/proxy.hpp
@@ -5,6 +5,7 @@
 // to its suitability for any purpose.
 #ifndef PROXY_DWA2002615_HPP
 # define PROXY_DWA2002615_HPP
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/object_core.hpp>
 # include <boost/python/object_operators.hpp>
 
diff --git a/include/boost/python/refcount.hpp b/include/boost/python/refcount.hpp
@@ -7,8 +7,6 @@
 # define REFCOUNT_DWA2002615_HPP
 
 # include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/cast.hpp>
 
 namespace boost { namespace python { 
diff --git a/include/boost/python/scope.hpp b/include/boost/python/scope.hpp
@@ -6,6 +6,7 @@
 #ifndef SCOPE_DWA2002724_HPP
 # define SCOPE_DWA2002724_HPP
 
+# include <boost/python/detail/prefix.hpp>
 # include <boost/python/object.hpp>
 # include <boost/python/refcount.hpp>
 # include <boost/utility.hpp>
diff --git a/include/boost/python/self.hpp b/include/boost/python/self.hpp
@@ -8,8 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/config.hpp>
-
 namespace boost { namespace python {
 
 #define BOOST_PYTHON_SELF_IS_CLASS
diff --git a/include/boost/python/type_id.hpp b/include/boost/python/type_id.hpp
@@ -8,8 +8,6 @@
 
 # include <boost/python/detail/prefix.hpp>
 
-# include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/detail/config.hpp>
 # include <boost/python/detail/msvc_typeinfo.hpp>
 # include <boost/operators.hpp>
 # include <typeinfo>
diff --git a/test/docstring.cpp b/test/docstring.cpp
diff --git a/test/embedding.cpp b/test/embedding.cpp
diff --git a/test/extract.cpp b/test/extract.cpp
diff --git a/test/m1.cpp b/test/m1.cpp
diff --git a/test/operators.cpp b/test/operators.cpp
diff --git a/test/pickle2.cpp b/test/pickle2.cpp
diff --git a/test/pickle3.cpp b/test/pickle3.cpp
diff --git a/test/select_holder.cpp b/test/select_holder.cpp
diff --git a/test/string_literal.cpp b/test/string_literal.cpp
diff --git a/test/test_builtin_converters.cpp b/test/test_builtin_converters.cpp
