diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e452aaab6a82c319855fd28433234f48b4e79ef5..27bf89d22fc9eb9391a9432470eaf03cd8cecaa3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,28 +1,31 @@
+2008-04-10 Benjamin Kosnik <bkoz@redhat.com>
+
+ * include/std/tuple: Consistency check for include guard, doxygen
+ file markup.
+ * include/std/date_time: Same.
+ * include/std/type_traits: Same.
+ * include/std/regex: Same.
+ * include/std/array: Same.
+ * include/std/system_error: Same, add error_code ctor.
+
2008-04-07 Johannes Singler <singler@ira.uka.de>
- * include/parallel/multiway_merge.h:
- Moved decisions to compiletime instead of runtime.
- * include/parallel/losertree.h:
- Removed obsolete variants, added variant that uses pointers
- in the loser tree.
- * include/parallel/types.h:
- Remove obsolete settings options from enum.
- * include/parallel/features.h:
- Remove obsolete compile-time switches.
- * include/parallel/compiletime_settings.h:
- Remove obsolete variant that copies back *after* sorting.
- * include/parallel/tags.h:
- Add one new tag for compile-time switch.
- * include/parallel/merge.h:
- Adapt to changes in multiway_merge.h.
- * include/parallel/multiway_mergesort.h:
- Adapt to changes in multiway_merge.h.
- Factor out splitting variants.
- Remove obsolete variant that copies back *after* sorting.
- * include/parallel/sort.h:
- Adapt to changes in multiway_mergesort.h.
- * testsuite/25_algorithms/sort/35588.cc:
- Added test case from / for PR 35588.
+ * include/parallel/multiway_merge.h: Moved decisions to
+ compile-time instead of run-time.
+ * include/parallel/losertree.h: Removed obsolete variants, added
+ variant that uses pointers in the loser tree.
+ * include/parallel/types.h: Remove obsolete settings options from enum.
+ * include/parallel/features.h: Remove obsolete compile-time switches.
+ * include/parallel/compiletime_settings.h: Remove obsolete variant
+ that copies back *after* sorting.
+ * include/parallel/tags.h: Add one new tag for compile-time switch.
+ * include/parallel/merge.h: Adapt to changes in multiway_merge.h.
+ * include/parallel/multiway_mergesort.h: Adapt to changes in
+ multiway_merge.h. Factor out splitting variants. Remove obsolete
+ variant that copies back *after* sorting.
+ * include/parallel/sort.h: Adapt to changes in multiway_mergesort.h.
+ * testsuite/25_algorithms/sort/35588.cc: Added test case from /
+ for PR 35588.
2008-03-29 Paolo Carlini <pcarlini@suse.de>
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array
index 691f41cbcd83e75ded704466e091e8d1cfab58fd..c84ddb6573fd1ca757297c9799d209639ee35b90 100644
--- a/libstdc++-v3/include/std/array
+++ b/libstdc++-v3/include/std/array
@@ -31,8 +31,8 @@
* This is a Standard C++ Library header.
*/
-#ifndef _GLIBCXX_CXX0X_ARRAY
-#define _GLIBCXX_CXX0X_ARRAY 1
+#ifndef _GLIBCXX_ARRAY
+#define _GLIBCXX_ARRAY 1
#pragma GCC system_header
@@ -60,4 +60,4 @@
# undef _GLIBCXX_INCLUDE_AS_CXX0X
#endif
-#endif // _GLIBCXX_CXX0X_ARRAY
+#endif // _GLIBCXX_ARRAY
diff --git a/libstdc++-v3/include/std/date_time b/libstdc++-v3/include/std/date_time
index b956a9b0119073c15cad6b51eadd820bd3edb112..0aca6b3b4ac2164f7489ef22aa9b04b8b242efb4 100644
--- a/libstdc++-v3/include/std/date_time
+++ b/libstdc++-v3/include/std/date_time
@@ -27,7 +27,7 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-/** @file include/date_time
+/** @file date_time
* This is a Standard C++ Library header.
*/
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex
index 5c257181f2e6ee4530b106655e6d65caf4e6d4da..9014fbabb2ebe24113a1778168dd9a0169a6107f 100644
--- a/libstdc++-v3/include/std/regex
+++ b/libstdc++-v3/include/std/regex
@@ -31,8 +31,8 @@
* This is a Standard C++ Library header.
*/
-#ifndef _GLIBCXX_CXX0X_REGEX
-#define _GLIBCXX_CXX0X_REGEX 1
+#ifndef _GLIBCXX_REGEX
+#define _GLIBCXX_REGEX 1
#pragma GCC system_header
@@ -67,4 +67,4 @@
# undef _GLIBCXX_INCLUDE_AS_CXX0X
#endif
-#endif // _GLIBCXX_CXX0X_REGEX
+#endif // _GLIBCXX_REGEX
diff --git a/libstdc++-v3/include/std/system_error b/libstdc++-v3/include/std/system_error
index c8973d147355dce786de99a08bbd7e76976cf3b7..5081e3f11ec3800633e8c48917e5e13a7c48b02b 100644
--- a/libstdc++-v3/include/std/system_error
+++ b/libstdc++-v3/include/std/system_error
@@ -1,6 +1,6 @@
// <system_error> -*- C++ -*-
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 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
@@ -27,7 +27,7 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-/** @file include/system_error
+/** @file system_error
* This is a Standard C++ Library header.
*/
@@ -142,6 +142,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
error_code _M_code;
public:
+ system_error(error_code __ec = error_code())
+ : runtime_error(""), _M_code(__ec) { }
+
system_error(const string& __what, error_code __ec = error_code())
: runtime_error(__what), _M_code(__ec) { }
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 3dda5301644f9034794b37f51b0b2c52f4f97b52..38a6bbb47f2358e6daf133ae1b57bb898e639284 100644
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -31,8 +31,8 @@
* This is a Standard C++ Library header.
*/
-#ifndef _GLIBCXX_CXX0X_TUPLE
-#define _GLIBCXX_CXX0X_TUPLE 1
+#ifndef _GLIBCXX_TUPLE
+#define _GLIBCXX_TUPLE 1
#pragma GCC system_header
@@ -644,4 +644,4 @@ namespace std
}; // anonymous namespace
}
-#endif // _GLIBCXX_CXX0X_TUPLE
+#endif // _GLIBCXX_TUPLE
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 1f9a2d9f72db56162940083046c53dcb3dd3cd45..66650f540d904ae04eca5f529b11496091577ae3 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -31,12 +31,12 @@
* This is a Standard C++ Library header.
*/
-#ifndef _GLIBCXX_CXX0X_TYPE_TRAITS
-#define _GLIBCXX_CXX0X_TYPE_TRAITS 1
+#ifndef _GLIBCXX_TYPE_TRAITS
+#define _GLIBCXX_TYPE_TRAITS 1
#pragma GCC system_header
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#ifndef __GXX_EXPERIMENTAL__
# include <c++0x_warning.h>
#endif
@@ -553,5 +553,5 @@ namespace std
struct make_signed<bool>;
}
-#endif // _GLIBCXX_CXX0X_TYPE_TRAITS
+#endif // _GLIBCXX_TYPE_TRAITS