Patches to support Synopsis

dabrahams · dabrahams · commit 0593074196e1 · 2002-10-12T15:37:34.000Z
[SVN r15906]
diff --git a/include/boost/python/converter/pyobject_type.hpp b/include/boost/python/converter/pyobject_type.hpp
@@ -6,6 +6,7 @@
 #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>
 
diff --git a/include/boost/python/converter/rvalue_from_python_data.hpp b/include/boost/python/converter/rvalue_from_python_data.hpp
@@ -94,7 +94,8 @@ struct rvalue_from_python_data : rvalue_from_python_storage<T>
 {
 # if (!defined(__MWERKS__) || __MWERKS__ >= 0x3000) \
         && (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 245) \
-        && (!defined(__DECCXX_VER) || __DECCXX_VER > 60590014)
+        && (!defined(__DECCXX_VER) || __DECCXX_VER > 60590014) \
+        && !defined(BOOST_PYTHON_SYNOPSIS) /* Synopsis' OpenCXX has trouble parsing this */
     // This must always be a POD struct with m_data its first member.
     BOOST_STATIC_ASSERT(BOOST_PYTHON_OFFSETOF(rvalue_from_python_storage<T>,stage1) == 0);
 # endif
diff --git a/include/boost/python/detail/call_object.hpp b/include/boost/python/detail/call_object.hpp
diff --git a/include/boost/python/detail/exception_handler.hpp b/include/boost/python/detail/exception_handler.hpp
@@ -6,6 +6,7 @@
 #ifndef EXCEPTION_HANDLER_DWA2002810_HPP
 # define EXCEPTION_HANDLER_DWA2002810_HPP
 
+# include <boost/python/detail/config.hpp>
 # include <boost/function/function0.hpp>
 # include <boost/function/function2.hpp>
 
diff --git a/include/boost/python/detail/make_tuple.hpp b/include/boost/python/detail/make_tuple.hpp
@@ -1,16 +1,17 @@
+# ifndef BOOST_PYTHON_SYNOPSIS 
 # // Copyright David Abrahams 2002. Permission to copy, use,
 # // modify, sell and distribute this software is granted provided this
 # // copyright notice appears in all copies. This software is provided
 # // "as is" without express or implied warranty, and with no claim as
 # // to its suitability for any purpose.
 
-#if !defined(BOOST_PP_IS_ITERATING)
-# error Boost.Python - do not include this file!
-#endif
+#  if !defined(BOOST_PP_IS_ITERATING)
+#   error Boost.Python - do not include this file!
+#  endif
 
-#define N BOOST_PP_ITERATION()
+#  define N BOOST_PP_ITERATION()
 
-#define BOOST_PYTHON_MAKE_TUPLE_ARG(z, N, ignored)      \
+#  define BOOST_PYTHON_MAKE_TUPLE_ARG(z, N, ignored)    \
     PyTuple_SET_ITEM(                                   \
         result.ptr()                                    \
         , N                                             \
@@ -26,6 +27,7 @@
         return result;
     }
 
-#undef BOOST_PYTHON_MAKE_TUPLE_ARG
+#  undef BOOST_PYTHON_MAKE_TUPLE_ARG
 
-#undef N
+#  undef N
+# endif // BOOST_PYTHON_SYNOPSIS 
diff --git a/include/boost/python/detail/module_base.hpp b/include/boost/python/detail/module_base.hpp
diff --git a/include/boost/python/detail/scope.hpp b/include/boost/python/detail/scope.hpp
@@ -6,6 +6,8 @@
 #ifndef SCOPE_DWA2002927_HPP
 # define SCOPE_DWA2002927_HPP
 
+# include <boost/python/detail/config.hpp>
+
 namespace boost { namespace python { namespace detail {
 
 void BOOST_PYTHON_DECL scope_setattr_doc(char const* name, object const& obj, char const* doc);
diff --git a/include/boost/python/detail/type_list_impl.hpp b/include/boost/python/detail/type_list_impl.hpp
@@ -7,6 +7,8 @@
 # ifndef TYPE_LIST_IMPL_DWA2002913_HPP
 #  define TYPE_LIST_IMPL_DWA2002913_HPP
 
+#  include <boost/python/detail/type_list.hpp>
+
 #  include <boost/preprocessor/enum_params.hpp>
 #  include <boost/preprocessor/enum_params_with_a_default.hpp>
 #  include <boost/preprocessor/repetition/enum.hpp>
diff --git a/include/boost/python/detail/type_list_impl_no_pts.hpp b/include/boost/python/detail/type_list_impl_no_pts.hpp
@@ -7,6 +7,8 @@
 # ifndef TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
 #  define TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
 
+#  include <boost/python/detail/type_list.hpp>
+
 #  include <boost/preprocessor/enum_params.hpp>
 #  include <boost/preprocessor/enum_params_with_a_default.hpp>
 #  include <boost/preprocessor/cat.hpp>
diff --git a/include/boost/python/detail/type_list_utils.hpp b/include/boost/python/detail/type_list_utils.hpp
diff --git a/include/boost/python/object/add_to_namespace.hpp b/include/boost/python/object/add_to_namespace.hpp
@@ -6,6 +6,7 @@
 #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/construct.hpp b/include/boost/python/object/construct.hpp
diff --git a/include/boost/python/object/pickle_support.hpp b/include/boost/python/object/pickle_support.hpp
@@ -4,7 +4,9 @@
 //  software is provided "as is" without express or implied warranty, and
 //  with no claim as to its suitability for any purpose.
 #ifndef BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
-#define BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
+# define BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
+
+# include <boost/python/detail/config.hpp>
 
 namespace boost { namespace python {
 
diff --git a/include/boost/python/object_call.hpp b/include/boost/python/object_call.hpp
@@ -1,14 +1,15 @@
+# if !defined(BOOST_PYTHON_SYNOPSIS)
 # // Copyright David Abrahams 2002. Permission to copy, use,
 # // modify, sell and distribute this software is granted provided this
 # // copyright notice appears in all copies. This software is provided
 # // "as is" without express or implied warranty, and with no claim as
 # // to its suitability for any purpose.
 
-#if !defined(BOOST_PP_IS_ITERATING)
-# error Boost.Python - do not include this file!
-#endif
+#  if !defined(BOOST_PP_IS_ITERATING)
+#   error Boost.Python - do not include this file!
+#  endif
 
-#define N BOOST_PP_ITERATION()
+#  define N BOOST_PP_ITERATION()
 
     template <BOOST_PP_ENUM_PARAMS_Z(1, N, class A)>
     typename detail::dependent<object, A0>::type
@@ -19,4 +20,5 @@
         return call<obj>(get_managed_object(self, tag), BOOST_PP_ENUM_PARAMS_Z(1, N, a));
     }
 
-#undef N
+#  undef N
+# endif // BOOST_PYTHON_SYNOPSIS 
diff --git a/include/boost/python/object_protocol_core.hpp b/include/boost/python/object_protocol_core.hpp
@@ -6,6 +6,7 @@
 #ifndef OBJECT_PROTOCOL_CORE_DWA2002615_HPP
 # define OBJECT_PROTOCOL_CORE_DWA2002615_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
@@ -169,16 +169,16 @@ namespace detail                                                        \
   };                                                                    \
 } 
 
-# define BOOST_PYTHON_BINARY_OPERATOR(id, rid, op)                      \
-BOOST_PYTHON_BINARY_OPERATION(id, rid, l op r)                          \
-namespace self_ns                                                       \
-{                                                                       \
-  template <class L, class R>                                           \
-  inline detail::operator_<detail::op_##id,L,R>                         \
-  operator##op(L const&, R const&)                                      \
-  {                                                                     \
-      return detail::operator_<detail::op_##id,L,R>();                  \
-  }                                                                     \
+# define BOOST_PYTHON_BINARY_OPERATOR(id, rid, op)      \
+BOOST_PYTHON_BINARY_OPERATION(id, rid, l op r)          \
+namespace self_ns                                       \
+{                                                       \
+  template <class L, class R>                           \
+  inline detail::operator_<detail::op_##id,L,R>         \
+  operator op(L const&, R const&)                       \
+  {                                                     \
+      return detail::operator_<detail::op_##id,L,R>();  \
+  }                                                     \
 }
   
 BOOST_PYTHON_BINARY_OPERATOR(add, radd, +)
@@ -262,7 +262,7 @@ namespace self_ns                                               \
 {                                                               \
   template <class R>                                            \
   inline detail::operator_<detail::op_##id,self_t,R>            \
-  operator##op(self_t const&, R const&)                         \
+  operator op(self_t const&, R const&)                          \
   {                                                             \
       return detail::operator_<detail::op_##id,self_t,R>();     \
   }                                                             \
