|
From: Frank M. H. <fm...@us...> - 2007-02-20 00:40:46
|
Update of /cvsroot/boost-sandbox/boost-sandbox/boost In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11998 Modified Files: deconstruct_ptr.hpp Log Message: Handle null pointers gracefully. Index: deconstruct_ptr.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/deconstruct_ptr.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- deconstruct_ptr.hpp 7 Feb 2007 18:14:48 -0000 1.2 +++ deconstruct_ptr.hpp 20 Feb 2007 00:40:44 -0000 1.3 @@ -50,6 +50,7 @@ template<typename T> shared_ptr<T> deconstruct_ptr(T *ptr) { + if(ptr == 0) return shared_ptr<T>(); shared_ptr<T> shared(ptr, boost::predestructing_deleter<T>()); deconstruct_detail::do_postconstruct(ptr); return shared; @@ -57,6 +58,7 @@ template<typename T, typename D> shared_ptr<T> deconstruct_ptr(T *ptr, D deleter) { + if(ptr == 0) return shared_ptr<T>(); shared_ptr<T> shared(ptr, deleter); deconstruct_detail::do_postconstruct(ptr); return shared; |