expect_non_null optimization

dabrahams · dabrahams · commit 52ba3c7f8054 · 2002-06-12T20:52:53.000Z
[SVN r14134]
diff --git a/include/boost/python/errors.hpp b/include/boost/python/errors.hpp
@@ -35,17 +35,17 @@ inline void handle_exception()
     handle_exception(detail::rethrow);
 }
 
-BOOST_PYTHON_DECL PyObject* expect_non_null_impl(PyObject* x);
+BOOST_PYTHON_DECL void throw_argument_error();
+BOOST_PYTHON_DECL void throw_error_already_set();
 
 template <class T>
 inline T* expect_non_null(T* x)
 {
-    return (T*)expect_non_null_impl((PyObject*)x);
+    if (x == 0)
+        throw_error_already_set();
+    return x;
 }
 
-BOOST_PYTHON_DECL void throw_argument_error();
-BOOST_PYTHON_DECL void throw_error_already_set();
-
 }} // namespace boost::python
 
 #endif // ERRORS_DWA052500_H_

Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,17 @@ inline void handle_exception()`
`35`	`35`	`handle_exception(detail::rethrow);`
`36`	`36`	`}`
`37`	`37`
`38`		`-BOOST_PYTHON_DECL PyObject* expect_non_null_impl(PyObject* x);`
	`38`	`+BOOST_PYTHON_DECL void throw_argument_error();`
	`39`	`+BOOST_PYTHON_DECL void throw_error_already_set();`
`39`	`40`
`40`	`41`	`template <class T>`
`41`	`42`	`inline T* expect_non_null(T* x)`
`42`	`43`	`{`
`43`		`- return (T)expect_non_null_impl((PyObject)x);`
	`44`	`+ if (x == 0)`
	`45`	`+ throw_error_already_set();`
	`46`	`+ return x;`
`44`	`47`	`}`
`45`	`48`
`46`		`-BOOST_PYTHON_DECL void throw_argument_error();`
`47`		`-BOOST_PYTHON_DECL void throw_error_already_set();`
`48`		`-`
`49`	`49`	`}} // namespace boost::python`
`50`	`50`
`51`	`51`	`#endif // ERRORS_DWA052500_H_`