diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-10 10:08:56 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-10 10:08:56 +0000 |
| commit | 59b4ed6a400bac7148eca89b95be6c128a7029f8 (patch) | |
| tree | 2ff98037ddef320ccc59d8fd077a61a69222b547 /libstdc++-v3/include/std/memory | |
| parent | 98ab9e8ffc983b1dbb880dd31516474bd93d2969 (diff) | |
| download | ppe42-gcc-59b4ed6a400bac7148eca89b95be6c128a7029f8.tar.gz ppe42-gcc-59b4ed6a400bac7148eca89b95be6c128a7029f8.zip | |
2010-08-10 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Avoid -Wall
warnings.
* include/bits/shared_ptr.h (shared_ptr<>::shared_ptr
(const shared_ptr<>&), shared_ptr(shared_ptr<>&&), weak_ptr<>::
weak_ptr(const weak_ptr<>&), weak_ptr(const shared_ptr<>&)):
Constrain appropriately via std::is_convertible, etc.
* include/bits/shared_ptr_base.h: Likewise.
* include/bits/unique_ptr.h (default_delete<>::
default_delete(const default_delete<>&),
unique_ptr<>::unique_ptr(unique_ptr<>&&), operator=(unique_ptr<>&&)):
Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust dg-error
line numbers.
* testsuite/20_util/shared_ptr/cons/43820.cc: Likewise.
* include/bits/unique_ptr.h (unique_ptr<>::unique_ptr(auto_ptr<>&&)):
Add.
* include/std/memory: Adjust includes order.
* testsuite/20_util/unique_ptr/cons/auto_ptr.cc: New.
* testsuite/20_util/unique_ptr/cons/auto_ptr_neg.cc: Likewise.
* testsuite/20_util/shared_ptr/cons/auto_ptr_neg.cc: Minor tweaks.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163053 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/memory')
| -rw-r--r-- | libstdc++-v3/include/std/memory | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index 3e7d4e8466b..42e948a30d0 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -1,6 +1,7 @@ // <memory> -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +// 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -81,10 +82,10 @@ # include <type_traits> # include <functional> # include <debug/debug.h> -# include <bits/unique_ptr.h> # if _GLIBCXX_DEPRECATED # include <backward/auto_ptr.h> # endif +# include <bits/unique_ptr.h> # if defined(_GLIBCXX_INCLUDE_AS_CXX0X) # include <tr1_impl/boost_sp_counted_base.h> # else |
