Split <functional> into smaller pieces

[thirdparty/gcc.git] / libstdc++-v3 / include / std / regex

diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex
index 3b25044e56e1322483fbc44df64f04c1d2edca5c..f5728245eb869ad02033689ef60d3b23172e56cf 100644 (file)
--- a/libstdc++-v3/include/std/regex
+++ b/libstdc++-v3/include/std/regex
@@ -1,6 +1,6 @@
 // <regex> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007-2016 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
@@ -31,38 +31,37 @@
 
 #pragma GCC system_header
 
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+#if __cplusplus < 201103L
+# include <bits/c++0x_warning.h>
 #else
 
-#if defined(_GLIBCXX_INCLUDE_AS_TR1)
-#  error C++0x header cannot be included from TR1 header
-#endif
-
 #include <algorithm>
 #include <bitset>
+#ifdef _GLIBCXX_DEBUG
+# include <iosfwd>
+#endif
 #include <iterator>
 #include <locale>
+#include <memory>
+#include <sstream>
+#include <stack>
 #include <stdexcept>
 #include <string>
-#include <vector>
 #include <utility>
-#include <sstream>
+#include <vector>
+#include <map>
+#include <cstring>
 
-#if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
-#  include <tr1_impl/regex>
-#else
-#  define _GLIBCXX_INCLUDE_AS_CXX0X
-#  define _GLIBCXX_BEGIN_NAMESPACE_TR1
-#  define _GLIBCXX_END_NAMESPACE_TR1
-#  define _GLIBCXX_TR1
-#  include <tr1_impl/regex>
-#  undef _GLIBCXX_TR1
-#  undef _GLIBCXX_END_NAMESPACE_TR1
-#  undef _GLIBCXX_BEGIN_NAMESPACE_TR1
-#  undef _GLIBCXX_INCLUDE_AS_CXX0X
-#endif
+#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>
+#include <bits/regex_scanner.h>
+#include <bits/regex_compiler.h>
+#include <bits/regex.h>
+#include <bits/regex_executor.h>
 
-#endif // __GXX_EXPERIMENTAL_CXX0X__
+#endif // C++11
 
 #endif // _GLIBCXX_REGEX