Python 2.3b1 compatibility: LONG_LONG -> PY_LONG_LONG

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit 022a5a16f5b0 · 2003-05-01T05:19:47.000Z
[SVN r18337]
diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp
@@ -103,8 +103,8 @@ BOOST_PYTHON_TO_INT(long)
 // using Python's macro instead of Boost's - we don't seem to get the
 // config right all the time.
 # ifdef HAVE_LONG_LONG 
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed LONG_LONG, PyLong_FromLongLong(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned LONG_LONG, PyLong_FromUnsignedLongLong(x))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed BOOST_PYTHON_LONG_LONG, PyLong_FromLongLong(x))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned BOOST_PYTHON_LONG_LONG, PyLong_FromUnsignedLongLong(x))
 # endif
     
 # undef BOOST_TO_PYTHON_INT
diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp
@@ -155,3 +155,13 @@ typedef int pid_t;
 #elif _MSC_VER
 # pragma warning(disable:4786)
 #endif
+
+#if defined(HAVE_LONG_LONG)
+# if defined(PY_LONG_LONG)
+#  define BOOST_PYTHON_LONG_LONG PY_LONG_LONG
+# elif defined(LONG_LONG)
+#  define BOOST_PYTHON_LONG_LONG LONG_LONG
+# else
+#  error "HAVE_LONG_LONG defined but not PY_LONG_LONG or LONG_LONG"
+# endif
+#endif
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
@@ -171,15 +171,15 @@ namespace
   
   struct long_long_rvalue_from_python : long_long_rvalue_from_python_base
   {
-      static LONG_LONG extract(PyObject* intermediate)
+      static BOOST_PYTHON_LONG_LONG extract(PyObject* intermediate)
       {
           if (PyInt_Check(intermediate))
           {
               return PyInt_AS_LONG(intermediate);
           }
           else
           {
-              LONG_LONG result = PyLong_AsLongLong(intermediate);
+              BOOST_PYTHON_LONG_LONG result = PyLong_AsLongLong(intermediate);
               
               if (PyErr_Occurred())
                   throw_error_already_set();
@@ -191,15 +191,15 @@ namespace
 
   struct unsigned_long_long_rvalue_from_python : long_long_rvalue_from_python_base
   {
-      static unsigned LONG_LONG extract(PyObject* intermediate)
+      static unsigned BOOST_PYTHON_LONG_LONG extract(PyObject* intermediate)
       {
           if (PyInt_Check(intermediate))
           {
-              return numeric_cast<unsigned LONG_LONG>(PyInt_AS_LONG(intermediate));
+              return numeric_cast<unsigned BOOST_PYTHON_LONG_LONG>(PyInt_AS_LONG(intermediate));
           }
           else
           {
-              unsigned LONG_LONG result = PyLong_AsUnsignedLongLong(intermediate);
+              unsigned BOOST_PYTHON_LONG_LONG result = PyLong_AsUnsignedLongLong(intermediate);
               
               if (PyErr_Occurred())
                   throw_error_already_set();
@@ -350,8 +350,8 @@ void initialize_builtin_converters()
 // using Python's macro instead of Boost's - we don't seem to get the
 // config right all the time.
 # ifdef HAVE_LONG_LONG
-    slot_rvalue_from_python<signed LONG_LONG,long_long_rvalue_from_python>();
-    slot_rvalue_from_python<unsigned LONG_LONG,unsigned_long_long_rvalue_from_python>();
+    slot_rvalue_from_python<signed BOOST_PYTHON_LONG_LONG,long_long_rvalue_from_python>();
+    slot_rvalue_from_python<unsigned BOOST_PYTHON_LONG_LONG,unsigned_long_long_rvalue_from_python>();
 # endif
         
     // floating types
diff --git a/test/test_builtin_converters.cpp b/test/test_builtin_converters.cpp
@@ -75,8 +75,8 @@ BOOST_PYTHON_MODULE(builtin_converters)
 // using Python's macro instead of Boost's - we don't seem to get the
 // config right all the time.
 #ifdef HAVE_LONG_LONG
-    def("rewrap_value_long_long", by_value<LONG_LONG>::rewrap);
-    def("rewrap_value_unsigned_long_long", by_value<unsigned LONG_LONG>::rewrap);
+    def("rewrap_value_long_long", by_value<BOOST_PYTHON_LONG_LONG>::rewrap);
+    def("rewrap_value_unsigned_long_long", by_value<unsigned BOOST_PYTHON_LONG_LONG>::rewrap);
 # endif 
     def("rewrap_value_float", by_value<float>::rewrap);
     def("rewrap_value_double", by_value<double>::rewrap);
@@ -106,8 +106,8 @@ BOOST_PYTHON_MODULE(builtin_converters)
 // using Python's macro instead of Boost's - we don't seem to get the
 // config right all the time.
 # ifdef HAVE_LONG_LONG
-    def("rewrap_const_reference_long_long", by_const_reference<LONG_LONG>::rewrap);
-    def("rewrap_const_reference_unsigned_long_long", by_const_reference<unsigned LONG_LONG>::rewrap);
+    def("rewrap_const_reference_long_long", by_const_reference<BOOST_PYTHON_LONG_LONG>::rewrap);
+    def("rewrap_const_reference_unsigned_long_long", by_const_reference<unsigned BOOST_PYTHON_LONG_LONG>::rewrap);
 # endif
     def("rewrap_const_reference_float", by_const_reference<float>::rewrap);
     def("rewrap_const_reference_double", by_const_reference<double>::rewrap);

Original file line number	Diff line number	Diff line change
`@@ -171,15 +171,15 @@ namespace`
`171`	`171`
`172`	`172`	`struct long_long_rvalue_from_python : long_long_rvalue_from_python_base`
`173`	`173`	`{`
`174`		`- static LONG_LONG extract(PyObject* intermediate)`
	`174`	`+ static BOOST_PYTHON_LONG_LONG extract(PyObject* intermediate)`
`175`	`175`	`{`
`176`	`176`	`if (PyInt_Check(intermediate))`
`177`	`177`	`{`
`178`	`178`	`return PyInt_AS_LONG(intermediate);`
`179`	`179`	`}`
`180`	`180`	`else`
`181`	`181`	`{`
`182`		`- LONG_LONG result = PyLong_AsLongLong(intermediate);`
	`182`	`+ BOOST_PYTHON_LONG_LONG result = PyLong_AsLongLong(intermediate);`
`183`	`183`
`184`	`184`	`if (PyErr_Occurred())`
`185`	`185`	`throw_error_already_set();`
`@@ -191,15 +191,15 @@ namespace`
`191`	`191`
`192`	`192`	`struct unsigned_long_long_rvalue_from_python : long_long_rvalue_from_python_base`
`193`	`193`	`{`
`194`		`- static unsigned LONG_LONG extract(PyObject* intermediate)`
	`194`	`+ static unsigned BOOST_PYTHON_LONG_LONG extract(PyObject* intermediate)`
`195`	`195`	`{`
`196`	`196`	`if (PyInt_Check(intermediate))`
`197`	`197`	`{`
`198`		`- return numeric_cast<unsigned LONG_LONG>(PyInt_AS_LONG(intermediate));`
	`198`	`+ return numeric_cast<unsigned BOOST_PYTHON_LONG_LONG>(PyInt_AS_LONG(intermediate));`
`199`	`199`	`}`
`200`	`200`	`else`
`201`	`201`	`{`
`202`		`- unsigned LONG_LONG result = PyLong_AsUnsignedLongLong(intermediate);`
	`202`	`+ unsigned BOOST_PYTHON_LONG_LONG result = PyLong_AsUnsignedLongLong(intermediate);`
`203`	`203`
`204`	`204`	`if (PyErr_Occurred())`
`205`	`205`	`throw_error_already_set();`
`@@ -350,8 +350,8 @@ void initialize_builtin_converters()`
`350`	`350`	`// using Python's macro instead of Boost's - we don't seem to get the`
`351`	`351`	`// config right all the time.`
`352`	`352`	`# ifdef HAVE_LONG_LONG`
`353`		`- slot_rvalue_from_python<signed LONG_LONG,long_long_rvalue_from_python>();`
`354`		`- slot_rvalue_from_python<unsigned LONG_LONG,unsigned_long_long_rvalue_from_python>();`
	`353`	`+ slot_rvalue_from_python<signed BOOST_PYTHON_LONG_LONG,long_long_rvalue_from_python>();`
	`354`	`+ slot_rvalue_from_python<unsigned BOOST_PYTHON_LONG_LONG,unsigned_long_long_rvalue_from_python>();`
`355`	`355`	`# endif`
`356`	`356`
`357`	`357`	`// floating types`