diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-03 00:27:48 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-03 00:27:48 +0000 |
| commit | f1d5e53ebf4963d62a2b03b4f13e695edca679dd (patch) | |
| tree | f1173ab656fbe2a4579047297db9a6d0fcea6a48 /libstdc++-v3/include/std/memory | |
| parent | fa94af7a38a42c107c51fd9c56c2227cc542ef67 (diff) | |
| download | ppe42-gcc-f1d5e53ebf4963d62a2b03b4f13e695edca679dd.tar.gz ppe42-gcc-f1d5e53ebf4963d62a2b03b4f13e695edca679dd.zip | |
* include/std/memory: Include auto_ptr.h later.
* include/bits/shared_ptr.h (shared_ptr(auto_ptr<_Up>&&): Remove
definition.
* include/bits/shared_ptr_base.h (__shared_ptr(auto_ptr<_Up>&&):
Likewise.
* include/bits/unique_ptr.h (unique_ptr(auto_ptr<_Up>&&): Likewise.
* include/backward/auto_ptr.h (unique_ptr(auto_ptr<_Up>&&): Define.
(shared_ptr(auto_ptr<_Up>&&, __shared_ptr(auto_ptr<_Up>&&): Likewise.
* include/std/future: Reduce header dependencies.
* testsuite/20_util/default_delete/48631_neg.cc: Adjust dg-error line
numbers.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Likewise.
* testsuite/20_util/unique_ptr/assign/48635_neg.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190109 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/memory')
| -rw-r--r-- | libstdc++-v3/include/std/memory | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index e846eba489d..73482ff085b 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -1,8 +1,6 @@ // <memory> -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -// 2009, 2010, 2011 -// Free Software Foundation, Inc. +// Copyright (C) 2001-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -80,11 +78,11 @@ # include <type_traits> # include <functional> # include <debug/debug.h> +# include <bits/unique_ptr.h> +# include <bits/shared_ptr.h> # if _GLIBCXX_USE_DEPRECATED # include <backward/auto_ptr.h> # endif -# include <bits/unique_ptr.h> -# include <bits/shared_ptr.h> #else # include <backward/auto_ptr.h> #endif |
