diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-10 17:43:51 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-10 17:43:51 +0000 |
| commit | fa00e900787af891e494907e2775ca794432fc48 (patch) | |
| tree | 4fa41f885f21038638fb7eccae1a410a5190c208 /libstdc++-v3/testsuite | |
| parent | bcc2fca8d64d3da30bec4806881e1753c005f66e (diff) | |
| download | gcc-fa00e900787af891e494907e2775ca794432fc48.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170016 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite')
3 files changed, 13 insertions, 11 deletions
diff --git a/libstdc++-v3/testsuite/20_util/headers/utility/synopsis.cc b/libstdc++-v3/testsuite/20_util/headers/utility/synopsis.cc index 49d7c2ffe84..aea7bb3bf40 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 2769bcac2bf..6c61b94303c 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 601b16b7d82..c45013a12d5 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 |