feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Changed #includes to avoid circular dependencies between shared_ptr and TR1.

Browse Source 
[SVN r44595]
This commit is contained in:
John Maddock
2008-04-19 16:28:00 +00:00
parent 3a578ac7c1
commit 35f2af947c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/detail/shared_count.hpp
View File

@ -28,8 +28,11 @@
#include <boost/detail/bad_weak_ptr.hpp> #include <boost/detail/bad_weak_ptr.hpp>
#include <boost/detail/sp_counted_base.hpp> #include <boost/detail/sp_counted_base.hpp>
#include <boost/detail/sp_counted_impl.hpp> #include <boost/detail/sp_counted_impl.hpp>
// In order to avoid circular dependencies with Boost.TR1
#include <memory> // std::auto_ptr // 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 <functional> // std::less #include <functional> // std::less
#include <new> // std::bad_alloc #include <new> // std::bad_alloc

6
include/boost/shared_ptr.hpp
View File

@ -20,7 +20,11 @@
#include <boost/detail/shared_ptr_nmt.hpp> #include <boost/detail/shared_ptr_nmt.hpp>
#else #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/assert.hpp>
#include <boost/checked_delete.hpp> #include <boost/checked_delete.hpp>