diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-04-15 20:05:45 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-04-15 20:05:45 +0100 |
| commit | 3a0f3672e53baa9accab7427bb47eaa8a7a2f151 (patch) | |
| tree | 5889e2a93598938cf0aac4d40ff9ebf40bef8cc1 /libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements | |
| parent | 227df36e33d877a31ac1beb8755214ede47e6f76 (diff) | |
| download | gcc-3a0f3672e53baa9accab7427bb47eaa8a7a2f151.tar.gz | |
re PR c++/60786 (In C++11 an explicit instantiation with an unqualified name must be in the right namespace)
PR c++/60786
* testsuite/20_util/shared_ptr/requirements/explicit_instantiation/
1.cc: Fix invalid explicit instantiations with unqualified names.
* testsuite/20_util/shared_ptr/requirements/explicit_instantiation/
2.cc: Likweise.
* testsuite/20_util/tuple/53648.cc: Likweise.
* testsuite/20_util/weak_ptr/requirements/explicit_instantiation/1.cc:
Likewise.
* testsuite/20_util/weak_ptr/requirements/explicit_instantiation/2.cc:
Likewise.
* testsuite/23_containers/unordered_map/requirements/
debug_container.cc: Likewise.
* testsuite/23_containers/unordered_map/requirements/
explicit_instantiation/3.cc: Likewise.
* testsuite/23_containers/unordered_multimap/requirements/debug.cc:
Likewise.
* testsuite/23_containers/unordered_multimap/requirements/
explicit_instantiation/3.cc: Likewise.
* testsuite/23_containers/unordered_multiset/requirements/debug.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/requirements/
explicit_instantiation/3.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/
debug_container.cc: Likewise.
* testsuite/23_containers/unordered_set/requirements/
explicit_instantiation/3.cc: Likewise.
From-SVN: r209431
Diffstat (limited to 'libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements')
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/debug.cc | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/debug.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/debug.cc index 488dbe5e9ec..d2d70764f5c 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/debug.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/debug.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++0x" } +// { dg-options "-std=gnu++11" } // { dg-do compile } // Copyright (C) 2007-2014 Free Software Foundation, Inc. @@ -21,8 +21,6 @@ #include <string> #include <debug/unordered_map> -using namespace __gnu_debug; - using std::string; -template class unordered_multimap<string, float>; +template class __gnu_debug::unordered_multimap<string, float>; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc index e3d0f47c42c..8640bc320c4 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/requirements/explicit_instantiation/3.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++0x" } +// { dg-options "-std=gnu++11" } // { dg-do compile } // Copyright (C) 2007-2014 Free Software Foundation, Inc. @@ -21,4 +21,5 @@ #include <unordered_map> using namespace std; -template class unordered_multimap<int, int, hash<int>, equal_to<int>, allocator<char>>; +template class std::unordered_multimap<int, int, hash<int>, equal_to<int>, + allocator<char>>; |