Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r69242 - in trunk: boost libs/smart_ptr/test
From: pdimov_at_[hidden]
Date: 2011-02-24 15:29:40


Author: pdimov
Date: 2011-02-24 15:29:38 EST (Thu, 24 Feb 2011)
New Revision: 69242
URL: http://svn.boost.org/trac/boost/changeset/69242

Log:
Add include guards, make_shared.hpp to smart_ptr.hpp. Refs #4288. Refs #5189.
Text files modified:
   trunk/boost/smart_ptr.hpp | 6 ++++++
   trunk/libs/smart_ptr/test/smart_ptr_test.cpp | 5 +----
   2 files changed, 7 insertions(+), 4 deletions(-)

Modified: trunk/boost/smart_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr.hpp (original)
+++ trunk/boost/smart_ptr.hpp 2011-02-24 15:29:38 EST (Thu, 24 Feb 2011)
@@ -1,3 +1,6 @@
+#ifndef BOOST_SMART_PTR_HPP_INCLUDED
+#define BOOST_SMART_PTR_HPP_INCLUDED
+
 //
 // smart_ptr.hpp
 //
@@ -22,4 +25,7 @@
 # include <boost/weak_ptr.hpp>
 # include <boost/intrusive_ptr.hpp>
 # include <boost/enable_shared_from_this.hpp>
+# include <boost/make_shared.hpp>
 #endif
+
+#endif // #ifndef BOOST_SMART_PTR_HPP_INCLUDED

Modified: trunk/libs/smart_ptr/test/smart_ptr_test.cpp
==============================================================================
--- trunk/libs/smart_ptr/test/smart_ptr_test.cpp (original)
+++ trunk/libs/smart_ptr/test/smart_ptr_test.cpp 2011-02-24 15:29:38 EST (Thu, 24 Feb 2011)
@@ -33,10 +33,7 @@
 # pragma warn -8092 // template argument passed to 'find' is not an iterator
 #endif
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
+#include <boost/smart_ptr.hpp>
 
 #include <boost/detail/lightweight_test.hpp>
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk