Changeset 44595


Ignore:
Timestamp:
Apr 19, 2008, 4:28:00 PM (10 years ago)
Author:
John Maddock
Message:

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

Location:
trunk/boost
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/boost/detail/shared_count.hpp

    r44344 r44595  
    2929#include <boost/detail/sp_counted_base.hpp>
    3030#include <boost/detail/sp_counted_impl.hpp>
    31 
    32 #include <memory>           // std::auto_ptr
     31// In order to avoid circular dependencies with Boost.TR1
     32// we make sure that our include of <memory> doesn't try to
     33// pull in the TR1 headers: that's why we use this header
     34// rather than including <memory> directly:
     35#include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
    3336#include <functional>       // std::less
    3437#include <new>              // std::bad_alloc
  • trunk/boost/shared_ptr.hpp

    r44353 r44595  
    2121#else
    2222
    23 #include <memory>               // for std::auto_ptr
     23// In order to avoid circular dependencies with Boost.TR1
     24// we make sure that our include of <memory> doesn't try to
     25// pull in the TR1 headers: that's why we use this header
     26// rather than including <memory> directly:
     27#include <boost/config/no_tr1/memory.hpp>  // std::auto_ptr
    2428
    2529#include <boost/assert.hpp>
Note: See TracChangeset for help on using the changeset viewer.