aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/std/regex
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-10-21 16:32:25 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2016-10-21 16:32:25 +0100
commitc05986b936078409c99a8eb4ce81e371323132d0 (patch)
tree01c8b3f590f5e0d815a19879bd4dd02c5fbc3644 /libstdc++-v3/include/std/regex
parent75a434a91b590ce1e733ffcb5a5810221f94571f (diff)
downloadgcc-c05986b936078409c99a8eb4ce81e371323132d0.zip
gcc-c05986b936078409c99a8eb4ce81e371323132d0.tar.gz
gcc-c05986b936078409c99a8eb4ce81e371323132d0.tar.bz2
Split <functional> into smaller pieces
* include/Makefile.am: Add <bits/refwrap.h> and <bits/std_function.h>. Order alphabetically. * include/Makefile.in: Regenerate. * include/bits/refwrap.h: New header. (_Maybe_get_result_type,_Weak_result_type_impl, _Weak_result_type) (_Reference_wrapper_base_impl, _Reference_wrapper_base) (reference_wrapper, ref, cref): Move here from <functional>. * include/bits/shared_ptr_base.h: Include <bits/refwrap.h> and <bits/stl_function.h> instead of <functional>. * include/bits/std_function.h: New header. (_Maybe_unary_or_binary_function, bad_function_call) (__is_location_invariant, _Nocopy_types, _Any_data) (_Simple_type_wrapper, _Function_base, _Function_handler, function): Move here from <functional>. * include/bits/unique_ptr.h: Include <bits/stl_function.h>. * include/std/functional: Include new headers and move components to them. * include/std/future: Include <bits/std_function.h> instead of <functional>. * include/std/mutex: Likewise. * include/std/regex: Likewise. * src/c++11/compatibility-thread-c++0x.cc: Include <functional>. * testsuite/20_util/default_delete/48631_neg.cc: Adjust dg-error line. * testsuite/20_util/default_delete/void_neg.cc: Likewise. * testsuite/20_util/unique_ptr/assign/48635_neg.cc: Adjust dg-error lines. * testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc: Likewise. * testsuite/30_threads/packaged_task/49668.cc: Include <functional>. From-SVN: r241410
Diffstat (limited to 'libstdc++-v3/include/std/regex')
-rw-r--r--libstdc++-v3/include/std/regex2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex
index b003868..f572824 100644
--- a/libstdc++-v3/include/std/regex
+++ b/libstdc++-v3/include/std/regex
@@ -37,7 +37,6 @@
#include <algorithm>
#include <bitset>
-#include <functional>
#ifdef _GLIBCXX_DEBUG
# include <iosfwd>
#endif
@@ -54,6 +53,7 @@
#include <cstring>
#include <ext/aligned_buffer.h>
+#include <bits/std_function.h>
#include <bits/regex_constants.h>
#include <bits/regex_error.h>
#include <bits/regex_automaton.h>