diff options
| author | rus <rus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-11-09 20:58:24 +0000 |
|---|---|---|
| committer | rus <rus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-11-09 20:58:24 +0000 |
| commit | 7f4db7c80779ecbc57d1146654daf0acfe18de66 (patch) | |
| tree | 3af522a3b5e149c3fd498ecb1255994daae2129a /libstdc++-v3/include/std/memory | |
| parent | 611349f0ec42a37591db2cd02974a11a48d10edb (diff) | |
| download | gcc-profile-stdlib.tar.gz | |
merge from trunkprofile-stdlib
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/profile-stdlib@154052 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/memory')
| -rw-r--r-- | libstdc++-v3/include/std/memory | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 9defd487c60..3e7d4e8466b 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -46,6 +46,20 @@ #pragma GCC system_header +/** + * @defgroup memory Memory + * @ingroup utilities + * + * Components for memory allocation, deallocation, and management. + */ + +/** + * @defgroup pointer_abstractions Pointer Abstractions + * @ingroup memory + * + * Smart pointers, etc. + */ + #include <bits/stl_algobase.h> #include <bits/allocator.h> #include <bits/stl_construct.h> @@ -64,37 +78,29 @@ # include <ext/concurrence.h> # include <bits/functexcept.h> # include <bits/stl_function.h> // std::less -# include <bits/unique_ptr.h> -# include <debug/debug.h> # include <type_traits> # include <functional> +# include <debug/debug.h> +# include <bits/unique_ptr.h> # if _GLIBCXX_DEPRECATED # include <backward/auto_ptr.h> # endif # if defined(_GLIBCXX_INCLUDE_AS_CXX0X) # include <tr1_impl/boost_sp_counted_base.h> -# include <bits/shared_ptr.h> # else # define _GLIBCXX_INCLUDE_AS_CXX0X # define _GLIBCXX_BEGIN_NAMESPACE_TR1 # define _GLIBCXX_END_NAMESPACE_TR1 # define _GLIBCXX_TR1 # include <tr1_impl/boost_sp_counted_base.h> -# include <bits/shared_ptr.h> # undef _GLIBCXX_TR1 # undef _GLIBCXX_END_NAMESPACE_TR1 # undef _GLIBCXX_BEGIN_NAMESPACE_TR1 # undef _GLIBCXX_INCLUDE_AS_CXX0X # endif +# include <bits/shared_ptr.h> #else # include <backward/auto_ptr.h> #endif -/** - * @defgroup memory Memory - * @ingroup utilities - * - * Components for memory allocation, deallocation, and management. - */ - #endif /* _GLIBCXX_MEMORY */ |