boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2026-05-04 11:54:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged 44595, 44638, 44707, 44711, 44728 from trunk to release

Browse Source 
[SVN r47341]
This commit is contained in:
Peter Dimov
2008-07-12 10:41:24 +00:00
parent 0fd94d6d56
commit 774a8d330c
5 changed files with 76 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/shared_ptr.hpp
+6 -2
View File
@@ -20,7 +20,11 @@
#include <boost/detail/shared_ptr_nmt.hpp>
#else
#include <memory> // for std::auto_ptr
// In order to avoid circular dependencies with Boost.TR1
// we make sure that our include of <memory> doesn't try to
// pull in the TR1 headers: that's why we use this header
// rather than including <memory> directly:
#include <boost/config/no_tr1/memory.hpp> // std::auto_ptr
#include <boost/assert.hpp>
#include <boost/checked_delete.hpp>
@@ -573,7 +577,7 @@ template<class T> inline T * get_pointer(shared_ptr<T> const & p)
#if !defined(BOOST_NO_IOSTREAM)
#if defined(__GNUC__) && (__GNUC__ < 3)
#if defined(BOOST_NO_TEMPLATED_IOSTREAMS) || ( defined(__GNUC__) && (__GNUC__ < 3) )
template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
{