diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-13 17:59:19 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-13 17:59:19 +0100 |
| commit | d67dd0be9467f0a2842abf163254abf1c6cabaab (patch) | |
| tree | f140647350774241339aac4f46131e73a3d45bb8 /libstdc++-v3/include/std/mutex | |
| parent | 40799fe51fa1fc67d4fad71c335437166234f9fc (diff) | |
| download | gcc-d67dd0be9467f0a2842abf163254abf1c6cabaab.tar.gz | |
Avoid #include <functional> in other headers
* include/bits/shared_ptr_base.h: Include <functional>.
[!__cpp_rtti]: Do not include <typeinfo>.
* include/experimental/array: Do not include <functional>.
* include/experimental/memory: Include <bits/functional_hash.h>
instead of <functional>.
* include/experimental/propagate_const: Include <bits/stl_function.h>,
<bits/functional_hash.h>, and <bits/move.h> instead of <functional>.
* include/experimental/tuple: Do not include <functional>.
* include/std/future: Include <functional>.
* include/std/memory: Do not include <functional>.
* include/std/mutex: [_GLIBCXX_HAVE_TLS]: Likewise.
* testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Add
missing includes.
* testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise.
* testsuite/20_util/specialized_algorithms/memory_management_tools/
1.cc: Likewise.
* testsuite/30_threads/call_once/60497.cc: Likewise.
* testsuite/30_threads/lock/2.cc: Likewise.
* testsuite/30_threads/thread/native_handle/cancel.cc: Likewise.
* testsuite/experimental/algorithm/sample.cc: Likewise.
* testsuite/experimental/array/make_array.cc: Likewise.
* testsuite/experimental/array/neg.cc: Likewise. Adjust dg-error line.
* testsuite/experimental/propagate_const/assignment/move_neg.cc:
Adjust dg-error lines.
* testsuite/experimental/propagate_const/cons/move_neg.cc: Likewise.
* testsuite/experimental/propagate_const/requirements2.cc: Likewise.
* testsuite/experimental/propagate_const/requirements3.cc: Likewise.
* testsuite/experimental/propagate_const/requirements4.cc: Likewise.
* testsuite/experimental/propagate_const/requirements5.cc: Likewise.
From-SVN: r241131
Diffstat (limited to 'libstdc++-v3/include/std/mutex')
| -rw-r--r-- | libstdc++-v3/include/std/mutex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index e90006f43a0..0e1bc7fd412 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -39,13 +39,15 @@ #include <chrono> #include <exception> #include <type_traits> -#include <functional> #include <system_error> #include <bits/std_mutex.h> #if ! _GTHREAD_USE_MUTEX_TIMEDLOCK # include <condition_variable> # include <thread> #endif +#ifndef _GLIBCXX_HAVE_TLS +# include <functional> +#endif #ifdef _GLIBCXX_USE_C99_STDINT_TR1 |