fixup! fixup! fixup! fixup! develop

Author: e-kwsm

include/boost/python/converter/pytype_function.hpp

@@ -118,7 +118,7 @@ struct to_python_target_type
     static PyTypeObject const *get_pytype()
     {
         const converter::registration *r=converter::registry::query(
-            detail::unwind_type_id_((boost::type<T>*)0, (mpl::bool_<boost::python::detail::is_void<T>::value >*)0 )
+            detail::unwind_type_id_((boost::type<T>*)BOOST_NULLPTR, (mpl::bool_<boost::python::detail::is_void<T>::value >*)BOOST_NULLPTR )
             );
         return r ? r->to_python_target_type(): BOOST_NULLPTR;
     }

include/boost/python/detail/result.hpp

@@ -41,7 +41,7 @@ namespace boost { namespace python { namespace detail {
 #  include BOOST_PP_ITERATE()
 
 template <class R, class T>
-boost::type<R>* result(R (T::*), int = 0) { return 0; }
+boost::type<R>* result(R (T::*), int = 0) { return BOOST_NULLPTR; }
 
 #  if (defined(__MWERKS__) && __MWERKS__ < 0x3000)
 // This code actually works on all implementations, but why use it when we don't have to?
@@ -75,7 +75,7 @@ result(X const&, short) { return 0; }
 #  else // Simpler code for more-capable compilers
 template <class X>
 boost::type<typename X::result_type>*
-result(X const&, short = 0) { return 0; }
+result(X const&, short = 0) { return BOOST_NULLPTR; }
 
 #  endif
 

include/boost/python/detail/target.hpp

@@ -10,6 +10,7 @@
 
 #  include <boost/python/detail/preprocessor.hpp>
 
+#  include <boost/config.hpp>
 #  include <boost/type.hpp>
 
 #  include <boost/preprocessor/comma_if.hpp>
@@ -30,7 +31,7 @@ namespace boost { namespace python { namespace detail {
 #  include BOOST_PP_ITERATE()
 
 template <class R, class T>
-T& (* target(R (T::*)) )() { return 0; }
+T& (* target(R (T::*)) )() { return BOOST_NULLPTR; }
 
 }}} // namespace boost::python::detail
 

test/pytype_function.cpp

@@ -50,7 +50,7 @@ struct BFromPython
   static void* convertible(PyObject* obj_ptr)
   {
       extract<const A&> ex(obj_ptr);
-      if (!ex.check()) return 0;
+      if (!ex.check()) return BOOST_NULLPTR;
       return obj_ptr;
   }
 

test/voidptr.cpp

@@ -17,7 +17,7 @@ void *get()
 
 void *getnull()
 {
-    return 0;
+    return BOOST_NULLPTR;
 }
 
 void use(void *a)