procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid #include <functional> in other headers

Browse source 
* 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
This commit is contained in:
Jonathan Wakely 2016-10-13 17:59:19 +01:00 • committed by Jonathan Wakely
parent 40799fe51f
commit d67dd0be94
24 changed files with 66 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libstdc++-v3/ChangeLog
View file

@ -1,5 +1,35 @@
2016-10-13 Jonathan Wakely <jwakely@redhat.com>
* 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.
* testsuite/experimental/algorithm/sample.cc: Add missing header.
* include/experimental/propagate_const (element_type): Qualify

5
libstdc++-v3/include/bits/shared_ptr_base.h
View file

@ -49,7 +49,10 @@
#ifndef _SHARED_PTR_BASE_H
#define _SHARED_PTR_BASE_H 1
#include <typeinfo>
#include <functional>
#if __cpp_rtti
# include <typeinfo>
#endif
#include <bits/allocated_ptr.h>
#include <ext/aligned_buffer.h>

1
libstdc++-v3/include/experimental/array
View file

@ -36,7 +36,6 @@
#else
#include <array>
#include <functional>
#include <experimental/type_traits>
namespace std _GLIBCXX_VISIBILITY(default)

2
libstdc++-v3/include/experimental/memory
View file

@ -42,8 +42,8 @@
#include <memory>
#include <type_traits>
#include <utility>
#include <functional>
#include <experimental/bits/shared_ptr.h>
#include <bits/functional_hash.h>
namespace std _GLIBCXX_VISIBILITY(default)
{

4
libstdc++-v3/include/experimental/propagate_const
View file

@ -36,7 +36,9 @@
#else
#include <type_traits>
#include <functional>
#include <bits/functional_hash.h>
#include <bits/move.h>
#include <bits/stl_function.h>
#include <experimental/bits/lfts_config.h>
namespace std _GLIBCXX_VISIBILITY(default)

1
libstdc++-v3/include/experimental/tuple
View file

@ -36,7 +36,6 @@
#else
#include <tuple>
#include <functional>
#include <bits/invoke.h>
#include <experimental/bits/lfts_config.h>

1
libstdc++-v3/include/std/future
View file

@ -40,6 +40,7 @@
#include <condition_variable>
#include <system_error>
#include <atomic>
#include <functional>
#include <bits/atomic_futex.h>
#include <bits/functexcept.h>
#include <bits/invoke.h>

1
libstdc++-v3/include/std/memory
View file

@ -76,7 +76,6 @@
# include <bits/stl_function.h> // std::less
# include <bits/uses_allocator.h>
# include <type_traits>
# include <functional>
# include <debug/debug.h>
# include <bits/unique_ptr.h>
# include <bits/shared_ptr.h>

4
libstdc++-v3/include/std/mutex
View file

@ -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

1
libstdc++-v3/testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc
View file

@ -28,6 +28,7 @@
#include <cstdlib>
#include <thread>
#include <atomic>
#include <functional>
#include <testsuite_hooks.h>
#ifdef _GLIBCXX_HAVE_UNISTD_H

1
libstdc++-v3/testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc
View file

@ -28,6 +28,7 @@
#include <cstdlib>
#include <thread>
#include <atomic>
#include <functional>
#include <testsuite_hooks.h>
#ifdef _GLIBCXX_HAVE_UNISTD_H

1
libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc
View file

@ -21,6 +21,7 @@
#include <testsuite_hooks.h>
#include <string>
#include <array>
#include <vector>
#include <sstream>
int del_count = 0;

1
libstdc++-v3/testsuite/30_threads/call_once/60497.cc
View file

@ -25,6 +25,7 @@
#include <mutex>
#include <memory>
#include <functional>
struct A;
template<typename T> struct B { T t; };

1
libstdc++-v3/testsuite/30_threads/lock/2.cc
View file

@ -24,6 +24,7 @@
#include <mutex>
#include <thread>
#include <functional>
#include <testsuite_hooks.h>
void locker(std::mutex& m1, std::mutex& m2, std::mutex& m3)

1
libstdc++-v3/testsuite/30_threads/thread/native_handle/cancel.cc
View file

@ -24,6 +24,7 @@
#include <pthread.h>
#include <thread>
#include <atomic>
#include <functional>
void f(std::atomic<bool>& started)
{

1
libstdc++-v3/testsuite/experimental/algorithm/sample.cc
View file

@ -23,6 +23,7 @@
#include <forward_list>
#include <vector>
#include <random>
#include <algorithm>
#include <testsuite_hooks.h>
std::mt19937 rng;

1
libstdc++-v3/testsuite/experimental/array/make_array.cc
View file

@ -18,6 +18,7 @@
// <http://www.gnu.org/licenses/>.
#include <experimental/array>
#include <functional>
struct MoveOnly
{

3
libstdc++-v3/testsuite/experimental/array/neg.cc
View file

@ -18,10 +18,11 @@
// <http://www.gnu.org/licenses/>.
#include <experimental/array>
#include <functional>
int main()
{
int dummy;
auto bad = std::experimental::make_array(std::ref(dummy));
// { dg-error "make_array cannot be used without an explicit target type if any of the types given is a reference_wrapper" "" { target *-*-* } 77 }
// { dg-error "make_array cannot be used without an explicit target type if any of the types given is a reference_wrapper" "" { target *-*-* } 76 }
}

2
libstdc++-v3/testsuite/experimental/propagate_const/assignment/move_neg.cc
View file

@ -25,7 +25,7 @@
using std::experimental::propagate_const;
using std::unique_ptr;
// { dg-error "no type" "" { target *-*-* } 159 }
// { dg-error "no type" "" { target *-*-* } 161 }
int main()
{

8
libstdc++-v3/testsuite/experimental/propagate_const/cons/move_neg.cc
View file

@ -25,10 +25,10 @@
using std::experimental::propagate_const;
using std::unique_ptr;
// { dg-error "no type" "" { target *-*-* } 118 }
// { dg-error "no type" "" { target *-*-* } 125 }
// { dg-error "no type" "" { target *-*-* } 134 }
// { dg-error "no type" "" { target *-*-* } 143 }
// { dg-error "no type" "" { target *-*-* } 120 }
// { dg-error "no type" "" { target *-*-* } 127 }
// { dg-error "no type" "" { target *-*-* } 136 }
// { dg-error "no type" "" { target *-*-* } 145 }
int main()
{

8
libstdc++-v3/testsuite/experimental/propagate_const/requirements2.cc
View file

@ -21,9 +21,9 @@
using std::experimental::propagate_const;
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 }
// { dg-error "not a pointer-to-object type" "" { target *-*-* } 66 }
// { dg-error "forming pointer to reference type" "" { target *-*-* } 185 }
// { dg-error "forming pointer to reference type" "" { target *-*-* } 211 }
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 }
// { dg-error "not a pointer-to-object type" "" { target *-*-* } 68 }
// { dg-error "forming pointer to reference type" "" { target *-*-* } 187 }
// { dg-error "forming pointer to reference type" "" { target *-*-* } 213 }
propagate_const<void*> test1;

2
libstdc++-v3/testsuite/experimental/propagate_const/requirements3.cc
View file

@ -21,6 +21,6 @@
using std::experimental::propagate_const;
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 }
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 }
propagate_const<void (*)()> test1;

6
libstdc++-v3/testsuite/experimental/propagate_const/requirements4.cc
View file

@ -21,8 +21,8 @@
using std::experimental::propagate_const;
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 }
// { dg-error "invalid type" "" { target *-*-* } 66 }
// { dg-error "uninitialized reference member" "" { target *-*-* } 112 }
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 }
// { dg-error "invalid type" "" { target *-*-* } 68 }
// { dg-error "uninitialized reference member" "" { target *-*-* } 114 }
propagate_const<int&> test1; // { dg-error "use of deleted function" }

2
libstdc++-v3/testsuite/experimental/propagate_const/requirements5.cc
View file

@ -21,6 +21,6 @@
using std::experimental::propagate_const;
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 }
// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 }
propagate_const<int[1]> test1;