tuple: Ifndef __GXX_EXPERIMENTAL_CXX0X__ just error out.
authorPaolo Carlini <paolo.carlini@oracle.com>
Mon, 26 May 2008 02:19:57 +0000 (02:19 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Mon, 26 May 2008 02:19:57 +0000 (02:19 +0000)
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:
libstdc++-v3/ChangeLog
libstdc++-v3/include/c_global/cmath
libstdc++-v3/include/c_std/cmath
libstdc++-v3/include/std/array
libstdc++-v3/include/std/condition_variable
libstdc++-v3/include/std/date_time
libstdc++-v3/include/std/mutex
libstdc++-v3/include/std/random
libstdc++-v3/include/std/regex
libstdc++-v3/include/std/system_error
libstdc++-v3/include/std/tuple
libstdc++-v3/include/std/type_traits
libstdc++-v3/include/std/unordered_map
libstdc++-v3/include/std/unordered_set

index a5003293c7beb4d8f2eb7b5bf7179c9578e5f9d8..6fae3e258dfdbc094d0dc4ca7165789f14333155 100644 (file)
@@ -1,3 +1,20 @@
+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),
index fad38e2f95de53e5219f2c33f4e92a0f725cb6e0..21e21507b08de3dd14c9a3956d03df9285b62c49 100644 (file)
@@ -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
index cc26880bb81cbef98872419d656fbf2c83b6e5a7..948a0bece2943c2d298386a7518cb82fac475681 100644 (file)
@@ -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
index c84ddb6573fd1ca757297c9799d209639ee35b90..fc3552aa8f911badd2c48fa8608c208c7163906d 100644 (file)
@@ -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
index c8d8f7845e462702abb55c785c57dba9f36d94d2..1dfb77894995a7d98d8a7f862c4c55290909b0d8 100644 (file)
@@ -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
index 0aca6b3b4ac2164f7489ef22aa9b04b8b242efb4..2ad9516971546a2720eb9ef012d0d65dc56c3fed 100644 (file)
@@ -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
index 6a75e7824164e81f888a8ae56736efbc68b9d1d2..5d4e52105f8fccf877fbea49aacc57a2c389620c 100644 (file)
@@ -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
index 2fccb6069855725d1bf48066b83d8580b735a5e6..395604b246a75ebaa3c73bdd5ac1b47731607d59 100644 (file)
@@ -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
index 9014fbabb2ebe24113a1778168dd9a0169a6107f..00d6f696a55a0c15455698ca75a7ea1b65c44c13 100644 (file)
@@ -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
index ac3b1f75b61f01148c68d5c14887e95cc93c4ecf..343eb6e83f71cf641e4889efc94b3cb71275dd8b 100644 (file)
@@ -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
 
index 83a81ee497aa1b049abb4b982aa4ae94c04454b5..a295e4ef9371b65a227c546cb72620999cf2ddc9 100644 (file)
@@ -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
index 66650f540d904ae04eca5f529b11496091577ae3..5fdc95ecad98875cd93f09fa8730d47c0a0f39a6 100644 (file)
@@ -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 
 
index 73be402e474353093951fcbe297d48076378a6bb..e338ef7805cbaa091da1f3d0a0cba51183bc5a5e 100644 (file)
@@ -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
index 1e599840fff9ffb3a559afc945332180002b3573..13b412b1eb5e9e0bd57a8e6d8a3a278ffe1e87b8 100644 (file)
@@ -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