diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-09-04 22:33:10 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-09-04 22:33:10 +0000 |
| commit | 5df8b36800471490ea5504b2ebb5e5151dd938fe (patch) | |
| tree | a9b85eb527c9aec92b2c0cd8c2e05c88b56d1091 /libstdc++-v3/include/tr1/memory | |
| parent | 5d4f552075c57705366212ead9692a9619353333 (diff) | |
| download | ppe42-gcc-5df8b36800471490ea5504b2ebb5e5151dd938fe.tar.gz ppe42-gcc-5df8b36800471490ea5504b2ebb5e5151dd938fe.zip | |
PR libstdc++/36962
* include/Makefile.am: Update headers.
* include/Makefile.in: Regenerate.
* include/std/memory: Update headers.
* include/tr1/memory: Likewise.
* include/tr1_impl/boost_shared_ptr.h: Remove, splitting into
separate implementations for std and tr1.
* include/bits/boost_sp_shared_count.h: Remove.
* include/tr1/boost_sp_shared_count.h: Remove.
* include/bits/shared_ptr.h: New. Combines boost_sp_shared_count.h
and boost_shared_ptr.h into one file.
(__shared_count,__shared_ptr,shared_ptr,swap): Add unique_ptr
and rvalue-reference support as per current WP.
* include/tr1/shared_ptr.h: New. Combines boost_sp_shared_count.h
and boost_shared_ptr.h into one file.
* testsuite/20_util/shared_ptr/cons/unique_ptr.cc: New.
* testsuite/20_util/shared_ptr/cons/unique_ptr_deleter.cc: New.
* testsuite/20_util/shared_ptr/cons/unique_ptr_deleter_ref.cc: New.
* testsuite/20_util/shared_ptr/cons/unique_ptr_neg.cc: New.
* testsuite/20_util/shared_ptr/assign/auto_ptr_rvalue.cc: New.
* testsuite/20_util/shared_ptr/assign/unique_ptr_lvalue_neg.cc: New.
* testsuite/20_util/shared_ptr/assign/unique_ptr_rvalue.cc: New.
* testsuite/20_util/shared_ptr/modifiers/swap_rvalue.cc: New.
* testsuite/20_util/shared_ptr/assign/auto_ptr_rvalue_neg.cc: Remove.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140012 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/tr1/memory')
| -rw-r--r-- | libstdc++-v3/include/tr1/memory | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libstdc++-v3/include/tr1/memory b/libstdc++-v3/include/tr1/memory index 134b5bd3f25..696a1821d14 100644 --- a/libstdc++-v3/include/tr1/memory +++ b/libstdc++-v3/include/tr1/memory @@ -55,16 +55,14 @@ #if defined(_GLIBCXX_INCLUDE_AS_TR1) # include <tr1_impl/boost_sp_counted_base.h> -# include <tr1/boost_sp_shared_count.h> -# include <tr1_impl/boost_shared_ptr.h> +# include <tr1/shared_ptr.h> #else # define _GLIBCXX_INCLUDE_AS_TR1 # define _GLIBCXX_BEGIN_NAMESPACE_TR1 namespace tr1 { # define _GLIBCXX_END_NAMESPACE_TR1 } # define _GLIBCXX_TR1 tr1:: # include <tr1_impl/boost_sp_counted_base.h> -# include <tr1/boost_sp_shared_count.h> -# include <tr1_impl/boost_shared_ptr.h> +# include <tr1/shared_ptr.h> # undef _GLIBCXX_TR1 # undef _GLIBCXX_END_NAMESPACE_TR1 # undef _GLIBCXX_BEGIN_NAMESPACE_TR1 |
