This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[v3] Small fixes

From: Paolo Carlini <paolo dot carlini at oracle dot com>
To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>
Date: Mon, 26 May 2008 04:18:23 +0200
Subject: [v3] Small fixes

Hi,

tested x86_64-linux, committed to mainline.

Paolo.

////////////////////

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.

Index: include/std/tuple
===================================================================
--- include/std/tuple	(revision 135877)
+++ include/std/tuple	(working copy)
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <utility>
 
@@ -645,4 +645,6 @@
   }; // anonymous namespace
 }
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _GLIBCXX_TUPLE
Index: include/std/date_time
===================================================================
--- include/std/date_time	(revision 135877)
+++ include/std/date_time	(working copy)
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <ctime>
 
@@ -206,8 +206,8 @@
     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 @@
     operator/(_Duration __lhs, long __rhs);
 }
 
-#endif /* _GLIBCXX_DATE_TIME */
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_DATE_TIME
Index: include/std/system_error
===================================================================
--- include/std/system_error	(revision 135877)
+++ include/std/system_error	(working copy)
@@ -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 @@
 
   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 @@
     : _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_END_NAMESPACE
 
-#endif 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_SYSTEM_ERROR
 
Index: include/std/type_traits
===================================================================
--- include/std/type_traits	(revision 135877)
+++ include/std/type_traits	(working copy)
@@ -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 @@
     struct make_signed<bool>;
 }
 
+#endif  // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif  // _GLIBCXX_TYPE_TRAITS 
 
Index: include/std/regex
===================================================================
--- include/std/regex	(revision 135877)
+++ include/std/regex	(working copy)
@@ -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: include/std/random
===================================================================
--- include/std/random	(revision 135877)
+++ include/std/random	(working copy)
@@ -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: include/std/unordered_map
===================================================================
--- include/std/unordered_map	(revision 135877)
+++ include/std/unordered_map	(working copy)
@@ -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: include/std/condition_variable
===================================================================
--- include/std/condition_variable	(revision 135877)
+++ include/std/condition_variable	(working copy)
@@ -38,7 +38,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <mutex> // unique_lock
 
@@ -159,4 +159,6 @@
 
 }
 
-#endif
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
+#endif // _GLIBCXX_CONDITION_VARIABLE
Index: include/std/unordered_set
===================================================================
--- include/std/unordered_set	(revision 135877)
+++ include/std/unordered_set	(working copy)
@@ -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
Index: include/std/mutex
===================================================================
--- include/std/mutex	(revision 135877)
+++ include/std/mutex	(working copy)
@@ -39,7 +39,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
-#endif
+#else
 
 #include <exception>
 #include <cstddef>
@@ -363,5 +363,6 @@
     }
 }
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
 
-#endif
+#endif // _GLIBCXX_MUTEX
Index: include/std/array
===================================================================
--- include/std/array	(revision 135877)
+++ include/std/array	(working copy)
@@ -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: include/c_std/cmath
===================================================================
--- include/c_std/cmath	(revision 135877)
+++ include/c_std/cmath	(working copy)
@@ -458,11 +458,8 @@
 
 #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: include/c_global/cmath
===================================================================
--- include/c_global/cmath	(revision 135877)
+++ include/c_global/cmath	(working copy)
@@ -476,11 +476,8 @@
 
 #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 Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]