Fixes for AIX

dabrahams · dabrahams · commit a0ff708d2933 · 2002-09-28T13:27:00.000Z
[SVN r15541]
diff --git a/src/numeric.cpp b/src/numeric.cpp
@@ -21,8 +21,8 @@ namespace
   std::string type_name;
 
   handle<> array_module;
-  object array_type;
-  object array_function;
+  handle<> array_type;
+  handle<> array_function;
 
   void throw_load_failure()
   {
@@ -56,12 +56,12 @@ namespace
 
               if (type && PyType_Check(type))
               {
-                  array_type = object(detail::new_non_null_reference(type));
+                  array_type = handle<>(type);
                   PyObject* function = ::PyObject_GetAttrString(module, const_cast<char*>("array"));
                   
                   if (function && PyCallable_Check(function))
                   {
-                      array_function = object(detail::new_reference(function));
+                      array_function = handle<>(function);
                       state = succeeded;
                   }
               }
@@ -78,10 +78,10 @@ namespace
       return false;
   }
 
-  object const& demand_array_function()
+  object demand_array_function()
   {
       load(true);
-      return array_function;
+      return object(array_function);
   }
 }
 
@@ -99,29 +99,29 @@ namespace aux
   {
       if (!load(false))
           return false;
-      return ::PyObject_IsInstance(obj, array_type.ptr());
+      return ::PyObject_IsInstance(obj, array_type.get());
   }
 
   python::detail::new_non_null_reference
   array_object_manager_traits::adopt(PyObject* obj)
   {
       load(true);
       return detail::new_non_null_reference(
-          pytype_check(downcast<PyTypeObject>(array_type.ptr()), obj));
+          pytype_check(downcast<PyTypeObject>(array_type.get()), obj));
   }
 
 
 # define BOOST_PYTHON_AS_OBJECT(z, n, _) object(x##n)
-# define BOOST_PP_LOCAL_MACRO(n)                                                        \
-    array_base::array_base(BOOST_PP_ENUM_PARAMS(n, object const& x))                    \
-        : object((load(true), array_function)(BOOST_PP_ENUM_PARAMS(n, x)))              \
+# define BOOST_PP_LOCAL_MACRO(n)                                        \
+    array_base::array_base(BOOST_PP_ENUM_PARAMS(n, object const& x))    \
+        : object(demand_array_function()(BOOST_PP_ENUM_PARAMS(n, x)))   \
     {}
 # define BOOST_PP_LOCAL_LIMITS (1, 6)
 # include BOOST_PP_LOCAL_ITERATE()
 # undef BOOST_PYTHON_AS_OBJECT
 
     array_base::array_base(BOOST_PP_ENUM_PARAMS(7, object const& x))
-        : object((load(true), array_type)(BOOST_PP_ENUM_PARAMS(7, x)))
+        : object(demand_array_function()(BOOST_PP_ENUM_PARAMS(7, x)))
     {}
 
   object array_base::argmax(long axis)

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ namespace`
`21`	`21`	`std::string type_name;`
`22`	`22`
`23`	`23`	`handle<> array_module;`
`24`		`- object array_type;`
`25`		`- object array_function;`
	`24`	`+ handle<> array_type;`
	`25`	`+ handle<> array_function;`
`26`	`26`
`27`	`27`	`void throw_load_failure()`
`28`	`28`	`{`
`@@ -56,12 +56,12 @@ namespace`
`56`	`56`
`57`	`57`	`if (type && PyType_Check(type))`
`58`	`58`	`{`
`59`		`- array_type = object(detail::new_non_null_reference(type));`
	`59`	`+ array_type = handle<>(type);`
`60`	`60`	`PyObject* function = ::PyObject_GetAttrString(module, const_cast<char*>("array"));`
`61`	`61`
`62`	`62`	`if (function && PyCallable_Check(function))`
`63`	`63`	`{`
`64`		`- array_function = object(detail::new_reference(function));`
	`64`	`+ array_function = handle<>(function);`
`65`	`65`	`state = succeeded;`
`66`	`66`	`}`
`67`	`67`	`}`
`@@ -78,10 +78,10 @@ namespace`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
`81`		`- object const& demand_array_function()`
	`81`	`+ object demand_array_function()`
`82`	`82`	`{`
`83`	`83`	`load(true);`
`84`		`- return array_function;`
	`84`	`+ return object(array_function);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`@@ -99,29 +99,29 @@ namespace aux`
`99`	`99`	`{`
`100`	`100`	`if (!load(false))`
`101`	`101`	`return false;`
`102`		`- return ::PyObject_IsInstance(obj, array_type.ptr());`
	`102`	`+ return ::PyObject_IsInstance(obj, array_type.get());`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`python::detail::new_non_null_reference`
`106`	`106`	`array_object_manager_traits::adopt(PyObject* obj)`
`107`	`107`	`{`
`108`	`108`	`load(true);`
`109`	`109`	`return detail::new_non_null_reference(`
`110`		`- pytype_check(downcast<PyTypeObject>(array_type.ptr()), obj));`
	`110`	`+ pytype_check(downcast<PyTypeObject>(array_type.get()), obj));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`
`114`	`114`	`# define BOOST_PYTHON_AS_OBJECT(z, n, _) object(x##n)`
`115`		`-# define BOOST_PP_LOCAL_MACRO(n) \`
`116`		`- array_base::array_base(BOOST_PP_ENUM_PARAMS(n, object const& x)) \`
`117`		`- : object((load(true), array_function)(BOOST_PP_ENUM_PARAMS(n, x))) \`
	`115`	`+# define BOOST_PP_LOCAL_MACRO(n) \`
	`116`	`+ array_base::array_base(BOOST_PP_ENUM_PARAMS(n, object const& x)) \`
	`117`	`+ : object(demand_array_function()(BOOST_PP_ENUM_PARAMS(n, x))) \`
`118`	`118`	`{}`
`119`	`119`	`# define BOOST_PP_LOCAL_LIMITS (1, 6)`
`120`	`120`	`# include BOOST_PP_LOCAL_ITERATE()`
`121`	`121`	`# undef BOOST_PYTHON_AS_OBJECT`
`122`	`122`
`123`	`123`	`array_base::array_base(BOOST_PP_ENUM_PARAMS(7, object const& x))`
`124`		`- : object((load(true), array_type)(BOOST_PP_ENUM_PARAMS(7, x)))`
	`124`	`+ : object(demand_array_function()(BOOST_PP_ENUM_PARAMS(7, x)))`
`125`	`125`	`{}`
`126`	`126`
`127`	`127`	`object array_base::argmax(long axis)`