diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-08-03 00:27:48 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-08-03 01:27:48 +0100 |
| commit | 6e48db73ed88eeb3e1025b28aa49c4f5ee4f3a76 (patch) | |
| tree | f1173ab656fbe2a4579047297db9a6d0fcea6a48 /libstdc++-v3/include/std/future | |
| parent | cbd782e1af15637c364840ee8bb2515d66cb8b5d (diff) | |
| download | gcc-6e48db73ed88eeb3e1025b28aa49c4f5ee4f3a76.zip gcc-6e48db73ed88eeb3e1025b28aa49c4f5ee4f3a76.tar.gz gcc-6e48db73ed88eeb3e1025b28aa49c4f5ee4f3a76.tar.bz2 | |
memory: Include auto_ptr.h later.
* 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.
From-SVN: r190109
Diffstat (limited to 'libstdc++-v3/include/std/future')
| -rw-r--r-- | libstdc++-v3/include/std/future | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 962400b..a8d7112 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1,6 +1,6 @@ // <future> -*- C++ -*- -// Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +// Copyright (C) 2009-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 @@ -36,14 +36,16 @@ #else #include <functional> -#include <memory> #include <mutex> #include <thread> #include <condition_variable> #include <system_error> -#include <exception> #include <atomic> #include <bits/functexcept.h> +#include <bits/unique_ptr.h> +#include <bits/shared_ptr.h> +#include <bits/uses_allocator.h> +#include <bits/alloc_traits.h> namespace std _GLIBCXX_VISIBILITY(default) { |