diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-02-10 17:43:51 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-02-10 17:43:51 +0000 |
| commit | a3fa23e44b9bb4bbcd68bd8c960c00d53afb7c23 (patch) | |
| tree | 4fa41f885f21038638fb7eccae1a410a5190c208 | |
| parent | 4fac45bdb4c2c1bd6cb97c99b482941dafe32ec1 (diff) | |
| download | gcc-a3fa23e44b9bb4bbcd68bd8c960c00d53afb7c23.zip gcc-a3fa23e44b9bb4bbcd68bd8c960c00d53afb7c23.tar.gz gcc-a3fa23e44b9bb4bbcd68bd8c960c00d53afb7c23.tar.bz2 | |
47628.cc: Do not test in C++0x mode.
2011-02-10 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/23_containers/multimap/modifiers/erase/47628.cc: Do
not test in C++0x mode.
* testsuite/23_containers/map/modifiers/erase/47628.cc: Likewise.
* testsuite/20_util/headers/utility/synopsis.cc: Tweak to work
in C++0x mode too.
From-SVN: r170016
4 files changed, 21 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 15bfe08..1f6d2e4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2011-02-10 Paolo Carlini <paolo.carlini@oracle.com> + + * testsuite/23_containers/multimap/modifiers/erase/47628.cc: Do + not test in C++0x mode. + * testsuite/23_containers/map/modifiers/erase/47628.cc: Likewise. + * testsuite/20_util/headers/utility/synopsis.cc: Tweak to work + in C++0x mode too. + 2011-02-10 Jonathan Wakely <jwakely.gcc@gmail.com> * doc/xml/manual/status_cxx200x.xml: Update. diff --git a/libstdc++-v3/testsuite/20_util/headers/utility/synopsis.cc b/libstdc++-v3/testsuite/20_util/headers/utility/synopsis.cc index 49d7c2f..aea7bb3 100644 --- a/libstdc++-v3/testsuite/20_util/headers/utility/synopsis.cc +++ b/libstdc++-v3/testsuite/20_util/headers/utility/synopsis.cc @@ -1,6 +1,6 @@ // { dg-do compile } -// Copyright (C) 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 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 @@ -31,15 +31,15 @@ namespace std { // lib.pairs, pairs: template <class T1, class T2> struct pair; template <class T1, class T2> - bool operator==(const pair<T1,T2>&, const pair<T1,T2>&); + _GLIBCXX_CONSTEXPR bool operator==(const pair<T1,T2>&, const pair<T1,T2>&); template <class T1, class T2> - bool operator< (const pair<T1,T2>&, const pair<T1,T2>&); + _GLIBCXX_CONSTEXPR bool operator< (const pair<T1,T2>&, const pair<T1,T2>&); template <class T1, class T2> - bool operator!=(const pair<T1,T2>&, const pair<T1,T2>&); + _GLIBCXX_CONSTEXPR bool operator!=(const pair<T1,T2>&, const pair<T1,T2>&); template <class T1, class T2> - bool operator> (const pair<T1,T2>&, const pair<T1,T2>&); + _GLIBCXX_CONSTEXPR bool operator> (const pair<T1,T2>&, const pair<T1,T2>&); template <class T1, class T2> - bool operator>=(const pair<T1,T2>&, const pair<T1,T2>&); + _GLIBCXX_CONSTEXPR bool operator>=(const pair<T1,T2>&, const pair<T1,T2>&); template <class T1, class T2> - bool operator<=(const pair<T1,T2>&, const pair<T1,T2>&); + _GLIBCXX_CONSTEXPR bool operator<=(const pair<T1,T2>&, const pair<T1,T2>&); } diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc index 2769bca..6c61b94 100644 --- a/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc @@ -33,13 +33,14 @@ struct Key bool operator<(const Key&) const; }; -typedef std::map<Key, int> Map; - +#ifndef __GXX_EXPERIMENTAL_CXX0X__ // libstdc++/47628 void f() { + typedef std::map<Key, int> Map; Map m; m.insert(Map::value_type()); Map::iterator i = m.begin(); m.erase(i); } +#endif diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/erase/47628.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/erase/47628.cc index 601b16b..c45013a 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/erase/47628.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/erase/47628.cc @@ -33,13 +33,14 @@ struct Key bool operator<(const Key&) const; }; -typedef std::multimap<Key, int> MMap; - +#ifndef __GXX_EXPERIMENTAL_CXX0X__ // libstdc++/47628 void f() { + typedef std::multimap<Key, int> MMap; MMap mm; mm.insert(MMap::value_type()); MMap::iterator i = mm.begin(); mm.erase(i); } +#endif |