diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-10-29 21:13:23 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-10-29 21:13:23 +0000 |
| commit | 5c420bf3e05787056fb07e68d40f55fad6680ff7 (patch) | |
| tree | dcc685cb8e3b6dcb9a78711d43471fd482c26f3a /libstdc++-v3/include/std/memory | |
| parent | e92e4c4f14b8f79c6e0be0a2479e5f8c8b2de1e2 (diff) | |
| download | ppe42-gcc-5c420bf3e05787056fb07e68d40f55fad6680ff7.tar.gz ppe42-gcc-5c420bf3e05787056fb07e68d40f55fad6680ff7.zip | |
2007-10-29 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/c++config (_GLIBCXX_DEPRECATED,
_GLIBCXX_USE_DEPRECATED): New. Adjust comments.
* include/bits/stl_auto_ptr.h: Move...
* includse/backward/auto_ptr.h: ...here.
* include/bits/stl_function.h (binder1st, binder2nd, bind1st,
bind2nd): Move...
* include/backward/binders.h: ...here. Deprecate in C++0x.
* include/tr1_impl/boost_shared_ptr.h: Guard auto_ptr usage.
* include/std/memory: Same.
* include/std/streambuf: Consistent use of _GLIBCXX_USE_DEPRECATED.
* include/backward/strstream: Fix guard macros.
* include/backward/backward_warning.h: Adjust for all new items.
* config/abi/pre/gnu.ver: Export basic_streambuf::stossc.
* include/Makefile.am (backward_headers): Adjust.
* include/Makefile.in: Regenerate.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129733 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/memory')
| -rw-r--r-- | libstdc++-v3/include/std/memory | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index a099b3ed177..39f72563d17 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -56,7 +56,6 @@ #include <bits/stl_construct.h> #include <bits/stl_uninitialized.h> #include <bits/stl_tempbuf.h> -#include <bits/stl_auto_ptr.h> #include <bits/stl_raw_storage_iter.h> #ifdef __GXX_EXPERIMENTAL_CXX0X__ @@ -73,6 +72,9 @@ # include <bits/stl_function.h> // std::less # include <debug/debug.h> # include <type_traits> +# if _GLIBCXX_USE_DEPRECATED +# include <backward/auto_ptr.h> +# endif # if defined(_GLIBCXX_INCLUDE_AS_CXX0X) # include <tr1_impl/boost_shared_ptr.h> # else @@ -86,6 +88,8 @@ # undef _GLIBCXX_BEGIN_NAMESPACE_TR1 # undef _GLIBCXX_INCLUDE_AS_CXX0X # endif +#else +# include <backward/auto_ptr.h> #endif #endif /* _GLIBCXX_MEMORY */ |
