OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace uses of std::tr1::unordered_map in testsuite 

* testsuite/util/testsuite_abi.h: Use std::unordered_map instead of
	std::tr1::unordered_map.
	* testsuite/util/testsuite_allocator.h: Likewise.

From-SVN: r276584
This commit is contained in:
Jonathan Wakely 2019-10-04 16:08:14 +01:00 committed by Jonathan Wakely
parent dde4026df0
commit 0a789c10e9
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
2019-10-04 Jonathan Wakely <jwakely@redhat.com>
* testsuite/util/testsuite_abi.h: Use std::unordered_map instead of
std::tr1::unordered_map.
* testsuite/util/testsuite_allocator.h: Likewise.
* include/tr1/hashtable.h: Add header for __gnu_cxx::__alloc_traits.
* include/tr1/hashtable.h (tr1::_Hashtable::_M_allocate_node): Use

4
libstdc++-v3/testsuite/util/testsuite_abi.h
View File

@ -22,7 +22,7 @@
#include <stdexcept>
#include <vector>
#include <locale>
#include <tr1/unordered_map>
#include <unordered_map>
#include <cxxabi.h>
// Encapsulates symbol characteristics.
@ -65,7 +65,7 @@ struct symbol
};
// Map type between symbol names and full symbol info.
typedef std::tr1::unordered_map<std::string, symbol> symbols;
typedef std::unordered_map<std::string, symbol> symbols;
// Check.

11
libstdc++-v3/testsuite/util/testsuite_allocator.h
View File

@ -26,7 +26,6 @@
#ifndef _GLIBCXX_TESTSUITE_ALLOCATOR_H
#define _GLIBCXX_TESTSUITE_ALLOCATOR_H
#include <tr1/unordered_map>
#include <bits/move.h>
#include <ext/pointer.h>
#include <ext/alloc_traits.h>
@ -36,6 +35,14 @@
# include <new>
#endif
#if __cplusplus >= 201103L
# include <unordered_map>
namespace unord = std;
#else
# include <tr1/unordered_map>
namespace unord = std::tr1;
#endif
namespace __gnu_test
{
class tracker_allocator_counter
@ -269,7 +276,7 @@ namespace __gnu_test
// (see N1599).
struct uneq_allocator_base
{
typedef std::tr1::unordered_map<void*, int> map_type;
typedef unord::unordered_map<void*, int> map_type;
// Avoid static initialization troubles and/or bad interactions
// with tests linking testsuite_allocator.o and playing globally