Skip to content

R
riscv-gcc-1
Commit 57317d2a by Paolo Carlini Committed by Paolo Carlini
Options

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
parent 73d1a021
Showing with 69 additions and 33 deletions
libstdc++-v3/ChangeLog
2008-05-25 Paolo Carlini <paolo.carlini@oracle.com> 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), * include/std/complex (complex<>::real(_Tp), complex<>::imag(_Tp),
complex<float>::real(float), complex<float>::imag(float), complex<float>::real(float), complex<float>::imag(float),
complex<double>::real(double), complex<double>::imag(double), complex<double>::real(double), complex<double>::imag(double),
......
libstdc++-v3/include/c_global/cmath
...@@ -476,11 +476,8 @@ _GLIBCXX_END_NAMESPACE ...@@ -476,11 +476,8 @@ _GLIBCXX_END_NAMESPACE
#if _GLIBCXX_USE_C99_MATH #if _GLIBCXX_USE_C99_MATH
#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC #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 fpclassify
#undef isfinite #undef isfinite
#undef isinf #undef isinf
......
libstdc++-v3/include/c_std/cmath
...@@ -458,11 +458,8 @@ _GLIBCXX_END_NAMESPACE ...@@ -458,11 +458,8 @@ _GLIBCXX_END_NAMESPACE
#if _GLIBCXX_USE_C99_MATH #if _GLIBCXX_USE_C99_MATH
#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC #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 fpclassify
#undef isfinite #undef isfinite
#undef isinf #undef isinf
......
libstdc++-v3/include/std/array
// <array> -*- C++ -*- // <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 // 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 // software; you can redistribute it and/or modify it under the
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#if defined(_GLIBCXX_INCLUDE_AS_TR1) #if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header # error C++0x header cannot be included from TR1 header
...@@ -60,4 +60,6 @@ ...@@ -60,4 +60,6 @@
# undef _GLIBCXX_INCLUDE_AS_CXX0X # undef _GLIBCXX_INCLUDE_AS_CXX0X
#endif #endif
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_ARRAY #endif // _GLIBCXX_ARRAY
libstdc++-v3/include/std/condition_variable
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#include <mutex> // unique_lock #include <mutex> // unique_lock
...@@ -159,4 +159,6 @@ namespace std ...@@ -159,4 +159,6 @@ namespace std
} }
#endif #endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_CONDITION_VARIABLE
libstdc++-v3/include/std/date_time
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#include <ctime> #include <ctime>
...@@ -206,8 +206,8 @@ namespace std ...@@ -206,8 +206,8 @@ namespace std
operator!=(const _LhsDuration& __lhs, const _RhsDuration& __rhs); operator!=(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
template<class _LhsDuration, class _RhsDuration> template<class _LhsDuration, class _RhsDuration>
bool bool
operator<(const _LhsDuration& __lhs, const _RhsDuration& __rhs); operator<(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
template<class _LhsDuration, class _RhsDuration> template<class _LhsDuration, class _RhsDuration>
bool bool
operator<=(const _LhsDuration& __lhs, const _RhsDuration& __rhs); operator<=(const _LhsDuration& __lhs, const _RhsDuration& __rhs);
...@@ -240,4 +240,6 @@ namespace std ...@@ -240,4 +240,6 @@ namespace std
operator/(_Duration __lhs, long __rhs); operator/(_Duration __lhs, long __rhs);
} }
#endif /* _GLIBCXX_DATE_TIME */ #endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_DATE_TIME
libstdc++-v3/include/std/mutex
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#include <exception> #include <exception>
#include <cstddef> #include <cstddef>
...@@ -363,5 +363,6 @@ namespace std ...@@ -363,5 +363,6 @@ namespace std
} }
} }
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif #endif // _GLIBCXX_MUTEX
libstdc++-v3/include/std/random
// <random> -*- C++ -*- // <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 // 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 // software; you can redistribute it and/or modify it under the
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#if defined(_GLIBCXX_INCLUDE_AS_TR1) #if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header # error C++0x header cannot be included from TR1 header
...@@ -70,4 +70,6 @@ ...@@ -70,4 +70,6 @@
# undef _GLIBCXX_INCLUDE_AS_CXX0X # undef _GLIBCXX_INCLUDE_AS_CXX0X
#endif #endif
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_RANDOM #endif // _GLIBCXX_RANDOM
libstdc++-v3/include/std/regex
// <regex> -*- C++ -*- // <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 // 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 // software; you can redistribute it and/or modify it under the
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#if defined(_GLIBCXX_INCLUDE_AS_TR1) #if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header # error C++0x header cannot be included from TR1 header
...@@ -67,4 +67,6 @@ ...@@ -67,4 +67,6 @@
# undef _GLIBCXX_INCLUDE_AS_CXX0X # undef _GLIBCXX_INCLUDE_AS_CXX0X
#endif #endif
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_REGEX #endif // _GLIBCXX_REGEX
libstdc++-v3/include/std/system_error
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#include <bits/c++config.h> #include <bits/c++config.h>
#include <bits/error_constants.h> #include <bits/error_constants.h>
...@@ -185,7 +185,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -185,7 +185,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template<typename charT, typename traits> template<typename charT, typename traits>
basic_ostream<charT,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 /// error_condition
...@@ -198,14 +198,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -198,14 +198,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
: _M_value(__v), _M_cat(__cat) { } : _M_value(__v), _M_cat(__cat) { }
template<typename _ErrorEnum> 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 void
assign(int val, const error_category& cat); assign(int val, const error_category& cat);
template<typename _ErrorEnum> template<typename _ErrorEnum>
error_condition& 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; } { _M_value = __v; }
void void
...@@ -317,5 +321,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -317,5 +321,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_GLIBCXX_END_NAMESPACE _GLIBCXX_END_NAMESPACE
#endif #endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_SYSTEM_ERROR
libstdc++-v3/include/std/tuple
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#include <utility> #include <utility>
...@@ -645,4 +645,6 @@ namespace std ...@@ -645,4 +645,6 @@ namespace std
}; // anonymous namespace }; // anonymous namespace
} }
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_TUPLE #endif // _GLIBCXX_TUPLE
libstdc++-v3/include/std/type_traits
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#pragma GCC system_header #pragma GCC system_header
#ifndef __GXX_EXPERIMENTAL__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#if defined(_GLIBCXX_INCLUDE_AS_TR1) #if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header # error C++0x header cannot be included from TR1 header
...@@ -553,5 +553,7 @@ namespace std ...@@ -553,5 +553,7 @@ namespace std
struct make_signed<bool>; struct make_signed<bool>;
} }
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_TYPE_TRAITS #endif // _GLIBCXX_TYPE_TRAITS
libstdc++-v3/include/std/unordered_map
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#if defined(_GLIBCXX_INCLUDE_AS_TR1) #if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header # error C++0x header cannot be included from TR1 header
...@@ -77,4 +77,6 @@ ...@@ -77,4 +77,6 @@
# include <debug/unordered_map> # include <debug/unordered_map>
#endif #endif
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_UNORDERED_MAP #endif // _GLIBCXX_UNORDERED_MAP
libstdc++-v3/include/std/unordered_set
// <unordered_set> -*- C++ -*- // <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 // 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 // software; you can redistribute it and/or modify it under the
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__ #ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h> # include <c++0x_warning.h>
#endif #else
#if defined(_GLIBCXX_INCLUDE_AS_TR1) #if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header # error C++0x header cannot be included from TR1 header
...@@ -77,4 +77,6 @@ ...@@ -77,4 +77,6 @@
# include <debug/unordered_set> # include <debug/unordered_set>
#endif #endif
#endif // __GXX_EXPERIMENTAL_CXX0X__
#endif // _GLIBCXX_UNORDERED_SET #endif // _GLIBCXX_UNORDERED_SET
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment