aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/c++11/functexcept.cc2
-rw-r--r--libstdc++-v3/src/c++11/regex.cc3
3 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 71471a2..10daa9f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-31 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * src/c++11/functexcept.cc: Do not include the whole <regex>.
+ * src/c++11/regex.cc: Likewise.
+
2013-07-31 Tim Shen <timshen91@gmail.com>
Revert last commit.
diff --git a/libstdc++-v3/src/c++11/functexcept.cc b/libstdc++-v3/src/c++11/functexcept.cc
index b74be7d..b0c1804 100644
--- a/libstdc++-v3/src/c++11/functexcept.cc
+++ b/libstdc++-v3/src/c++11/functexcept.cc
@@ -30,7 +30,7 @@
#include <system_error>
#include <future>
#include <functional>
-#include <regex>
+#include <bits/regex_error.h>
#ifdef _GLIBCXX_USE_NLS
# include <libintl.h>
diff --git a/libstdc++-v3/src/c++11/regex.cc b/libstdc++-v3/src/c++11/regex.cc
index b18afe2..bf86300 100644
--- a/libstdc++-v3/src/c++11/regex.cc
+++ b/libstdc++-v3/src/c++11/regex.cc
@@ -22,7 +22,8 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
-#include <regex>
+#include <stdexcept>
+#include <bits/regex_error.h>
namespace std _GLIBCXX_VISIBILITY(default)
{