[shared_Ptr][tr1] and those dreaded circular dependencies again.

A recent change in SVN head (whether directly to shared_ptr or something else I'm not sure) has broken some of the TR1 tests: http://beta.boost.org/development/tests/trunk/developer/output/daw-msvc71-bo... The two patches below would fix this, but as ever I'm open to other/better suggestions. Cheers, John. Index: C:/data/boost/boost/trunk/boost/detail/shared_count.hpp =================================================================== --- C:/data/boost/boost/trunk/boost/detail/shared_count.hpp (revision 44538) +++ C:/data/boost/boost/trunk/boost/detail/shared_count.hpp (working copy) @@ -29,7 +29,7 @@ #include <boost/detail/sp_counted_base.hpp> #include <boost/detail/sp_counted_impl.hpp> -#include <memory> // std::auto_ptr +#include <boost/config/no_tr1/memory.hpp> // std::auto_ptr #include <functional> // std::less #include <new> // std::bad_alloc Index: C:/data/boost/boost/trunk/boost/shared_ptr.hpp =================================================================== --- C:/data/boost/boost/trunk/boost/shared_ptr.hpp (revision 44538) +++ C:/data/boost/boost/trunk/boost/shared_ptr.hpp (working copy) @@ -20,7 +20,7 @@ #include <boost/detail/shared_ptr_nmt.hpp> #else -#include <memory> // for std::auto_ptr +#include <boost/config/no_tr1/memory.hpp> // for std::auto_ptr #include <boost/assert.hpp> #include <boost/checked_delete.hpp>
participants (2)
-
John Maddock
-
Peter Dimov