diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-15 19:05:45 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-15 19:05:45 +0000 |
| commit | f8d58828323a495d0b79b0081da93f8a4573a0ac (patch) | |
| tree | 5889e2a93598938cf0aac4d40ff9ebf40bef8cc1 /libstdc++-v3/testsuite/23_containers/unordered_map/requirements | |
| parent | b2b0c8e5a3a516b91d3ae7344d1f05f4df0a1c6b (diff) | |
| download | gcc-f8d58828323a495d0b79b0081da93f8a4573a0ac.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209431 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/23_containers/unordered_map/requirements')
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc | 18 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc | 5 |
2 files changed, 11 insertions, 12 deletions
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc index abd9d2c0bd0..c4d3442f672 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.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,18 +21,16 @@ #include <string> #include <debug/unordered_map> -using namespace __gnu_debug; - using std::allocator; using std::equal_to; using std::hash; using std::pair; using std::string; -template class unordered_map<string, float>; -template class unordered_map<string, int, - hash<string>, equal_to<string>, - allocator<pair<const string, int> > >; -template class unordered_map<string, float, - hash<string>, equal_to<string>, - allocator<char> >; +template class __gnu_debug::unordered_map<string, float>; +template class __gnu_debug::unordered_map<string, int, + hash<string>, equal_to<string>, + allocator<pair<const string, int>>>; +template class __gnu_debug::unordered_map<string, float, + hash<string>, equal_to<string>, + allocator<char>>; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc index de46c5ce621..145d23e123f 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/explicit_instantiation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/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_map<int, int, hash<int>, equal_to<int>, allocator<char>>; +template class std::unordered_map<int, int, hash<int>, equal_to<int>, + allocator<char>>; |