diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-02-10 22:40:53 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-02-10 22:40:53 +0000 |
| commit | 0cf1541f0c4cd9ad50d6e06a1f9dd0dd54b4a9c0 (patch) | |
| tree | 206f6a898f14be4347844c3a052eb119e56eae1e /libstdc++-v3 | |
| parent | 6df1f72e94e2d66a56952b541d66739e5f43165b (diff) | |
| download | gcc-0cf1541f0c4cd9ad50d6e06a1f9dd0dd54b4a9c0.zip gcc-0cf1541f0c4cd9ad50d6e06a1f9dd0dd54b4a9c0.tar.gz gcc-0cf1541f0c4cd9ad50d6e06a1f9dd0dd54b4a9c0.tar.bz2 | |
re PR libstdc++/47662 (-fno-operator-names no longer works with STL headers)
2011-02-10 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/47662
* include/bits/c++config: Do not use alternative token.
* testsuite/17_intro/headers/c++1998/operator_names.cc: New.
From-SVN: r170026
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/17_intro/headers/c++1998/operator_names.cc | 28 |
3 files changed, 35 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dc98cf7..961877e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2011-02-10 Jonathan Wakely <jwakely.gcc@gmail.com> + PR libstdc++/47662 + * include/bits/c++config: Do not use alternative token. + * testsuite/17_intro/headers/c++1998/operator_names.cc: New. + +2011-02-10 Jonathan Wakely <jwakely.gcc@gmail.com> + * src/future.cc (future_error_category::message): Handle no_state. 2011-02-10 Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 1d46c13..bab2b87 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -263,7 +263,7 @@ namespace std // _GLIBCXX_END_NAMESPACE_ALGO // _GLIBCXX_BEGIN_NAMESPACE_CONTAINER // _GLIBCXX_END_NAMESPACE_CONTAINER -#if defined(_GLIBCXX_DEBUG) or defined(_GLIBCXX_PROFILE) +#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PROFILE) # define _GLIBCXX_STD_C __cxx1998 # define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER \ namespace _GLIBCXX_STD_C { _GLIBCXX_BEGIN_NAMESPACE_VERSION diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/operator_names.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/operator_names.cc new file mode 100644 index 0000000..d1d01db --- /dev/null +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/operator_names.cc @@ -0,0 +1,28 @@ +// { dg-do compile } +// { dg-options "-fno-operator-names" } + +// Copyright (C) 2011 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// Avoid using PCH +#include <cerrno> +#include <bits/stdc++.h> +#include <bits/stdtr1c++.h> +#include <bits/extc++.h> + +int or, xor, and; + |