tuple: Ifndef __GXX_EXPERIMENTAL_CXX0X__ just error out.

2008-05-25  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/tuple: Ifndef __GXX_EXPERIMENTAL_CXX0X__ just error out.
	* include/std/date_time: Likewise.
	* include/std/system_error: Likewise.
	* include/std/type_traits: Likewise; fix typo in macro name.
	* include/std/regex: Likewise.
	* include/std/random: Likewise.
	* include/std/unordered_map: Likewise.
	* include/std/condition_variable: Likewise.
	* include/std/unordered_set: Likewise.
	* include/std/mutex: Likewise.
	* include/std/array: Likewise.

	* include/c_std/cmath: Fix obsolete comment.
	* include/c_global/cmath: Likewise.

From-SVN: r135890

14 files changed, 69 insertions, 33 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a500329..6fae3e2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,22 @@
 2008-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
+	* include/std/tuple: Ifndef __GXX_EXPERIMENTAL_CXX0X__ just error out.
+	* include/std/date_time: Likewise.
+	* include/std/system_error: Likewise.
+	* include/std/type_traits: Likewise; fix typo in macro name.
+	* include/std/regex: Likewise.
+	* include/std/random: Likewise.
+	* include/std/unordered_map: Likewise.
+	* include/std/condition_variable: Likewise.
+	* include/std/unordered_set: Likewise.
+	* include/std/mutex: Likewise.
+	* include/std/array: Likewise.
+
+	* include/c_std/cmath: Fix obsolete comment.
+	* include/c_global/cmath: Likewise.
+
+2008-05-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
 	* include/std/complex (complex<>::real(_Tp), complex<>::imag(_Tp),
 	complex<float>::real(float), complex<float>::imag(float),
 	complex<double>::real(double), complex<double>::imag(double),
diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
index fad38e2..21e2150 100644
--- a/libstdc++-v3/include/c_global/cmath
+++ b/libstdc++-v3/include/c_global/cmath
@@ -476,11 +476,8 @@ _GLIBCXX_END_NAMESPACE
 
 #if _GLIBCXX_USE_C99_MATH
 #if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-// These are possible macros imported from C99-land. For strict
-// conformance, remove possible C99-injected names from the global
-// namespace, and sequester them in the __gnu_cxx extension namespace.
 
-// Only undefine the C99 FP macros, if actually captured for namespace movement
+// These are possible macros imported from C99-land.
 #undef fpclassify
 #undef isfinite
 #undef isinf
diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/cmath
index cc26880..948a0be 100644
--- a/libstdc++-v3/include/c_std/cmath
+++ b/libstdc++-v3/include/c_std/cmath
@@ -458,11 +458,8 @@ _GLIBCXX_END_NAMESPACE
 
 #if _GLIBCXX_USE_C99_MATH
 #if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-// These are possible macros imported from C99-land. For strict
-// conformance, remove possible C99-injected names from the global
-// namespace, and sequester them in the __gnu_cxx extension namespace.
 
-// Only undefine the C99 FP macros, if actually captured for namespace movement
+// These are possible macros imported from C99-land.
 #undef fpclassify
 #undef isfinite
 #undef isinf
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array
index c84ddb6..fc3552a 100644
--- a/libstdc++-v3/include/std/array
+++ b/libstdc++-v3/include/std/array
@@ -1,6 +1,6 @@
 // <array> -*- 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
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  error C++0x header cannot be included from TR1 header
@@ -60,4 +60,6 @@
 #  undef _GLIBCXX_INCLUDE_AS_CXX0X
 #endif
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_ARRAY
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index c8d8f78..1dfb778 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <mutex> // unique_lock
 
@@ -159,4 +159,6 @@ namespace std
 
 }
 
-#endif
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_CONDITION_VARIABLE
diff --git a/libstdc++-v3/include/std/date_time b/libstdc++-v3/include/std/date_time
index 0aca6b3..2ad9516 100644
--- a/libstdc++-v3/include/std/date_time
+++ b/libstdc++-v3/include/std/date_time
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <ctime>
 
@@ -206,8 +206,8 @@ namespace std
     operator!=(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
   
   template<class _LhsDuration, class _RhsDuration>
-     bool
-     operator<(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
+    bool
+    operator<(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
   template<class _LhsDuration, class _RhsDuration>
     bool
     operator<=(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
@@ -240,4 +240,6 @@ namespace std
     operator/(_Duration __lhs, long __rhs);
 }
 
-#endif /* _GLIBCXX_DATE_TIME */
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_DATE_TIME
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index 6a75e78..5d4e521 100644
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -39,7 +39,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <exception>
 #include <cstddef>
@@ -363,5 +363,6 @@ namespace std
     }
 }
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
 
-#endif
+#endif // _GLIBCXX_MUTEX
diff --git a/libstdc++-v3/include/std/random b/libstdc++-v3/include/std/random
index 2fccb60..395604b 100644
--- a/libstdc++-v3/include/std/random
+++ b/libstdc++-v3/include/std/random
@@ -1,6 +1,6 @@
 // <random> -*- 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
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  error C++0x header cannot be included from TR1 header
@@ -70,4 +70,6 @@
 #  undef _GLIBCXX_INCLUDE_AS_CXX0X
 #endif
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_RANDOM
diff --git a/libstdc++-v3/include/std/regex b/libstdc++-v3/include/std/regex
index 9014fba..00d6f69 100644
--- a/libstdc++-v3/include/std/regex
+++ b/libstdc++-v3/include/std/regex
@@ -1,6 +1,6 @@
 // <regex> -*- 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
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  error C++0x header cannot be included from TR1 header
@@ -67,4 +67,6 @@
 #  undef _GLIBCXX_INCLUDE_AS_CXX0X
 #endif
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_REGEX
diff --git a/libstdc++-v3/include/std/system_error b/libstdc++-v3/include/std/system_error
index ac3b1f7..343eb6e 100644
--- a/libstdc++-v3/include/std/system_error
+++ b/libstdc++-v3/include/std/system_error
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <bits/c++config.h>
 #include <bits/error_constants.h>
@@ -185,7 +185,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   template<typename charT, typename traits>
     basic_ostream<charT,traits>&
-    operator<<(basic_ostream<charT,traits>& os, const error_code& __code);
+    operator<<(basic_ostream<charT, traits>& os, const error_code& __code);
 
 
   /// error_condition
@@ -198,14 +198,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     : _M_value(__v), _M_cat(__cat) { }
 
     template<typename _ErrorEnum>
-      error_condition(typename enable_if<is_error_condition_enum<_ErrorEnum>::value, _ErrorEnum>::type __v) : _M_value(__v), _M_cat(system_category) { }
+      error_condition(typename enable_if<
+		      is_error_condition_enum<_ErrorEnum>::value,
+		      _ErrorEnum>::type __v)
+      : _M_value(__v), _M_cat(system_category) { }
 
     void 
     assign(int val, const error_category& cat);
 
     template<typename _ErrorEnum>
       error_condition&
-      operator=(typename enable_if<is_error_condition_enum<_ErrorEnum>::value, _ErrorEnum>::type __v)
+      operator=(typename enable_if<is_error_condition_enum<_ErrorEnum>::value,
+		                   _ErrorEnum>::type __v)
       { _M_value = __v; }
 
     void 
@@ -317,5 +321,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
 _GLIBCXX_END_NAMESPACE
 
-#endif 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_SYSTEM_ERROR
 
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 83a81ee..a295e4e 100644
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <utility>
 
@@ -645,4 +645,6 @@ namespace std
   }; // anonymous namespace
 }
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_TUPLE
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 66650f5..5fdc95e 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -36,9 +36,9 @@
 
 #pragma GCC system_header
 
-#ifndef __GXX_EXPERIMENTAL__
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  error C++0x header cannot be included from TR1 header
@@ -553,5 +553,7 @@ namespace std
     struct make_signed<bool>;
 }
 
+#endif  // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif  // _GLIBCXX_TYPE_TRAITS 
 
diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map
index 73be402..e338ef7 100644
--- a/libstdc++-v3/include/std/unordered_map
+++ b/libstdc++-v3/include/std/unordered_map
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  error C++0x header cannot be included from TR1 header
@@ -77,4 +77,6 @@
 # include <debug/unordered_map>
 #endif
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_UNORDERED_MAP
diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set
index 1e59984..13b412b 100644
--- a/libstdc++-v3/include/std/unordered_set
+++ b/libstdc++-v3/include/std/unordered_set
@@ -1,6 +1,6 @@
 // <unordered_set> -*- 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
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  error C++0x header cannot be included from TR1 header
@@ -77,4 +77,6 @@
 # include <debug/unordered_set>
 #endif
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_UNORDERED_SET