Replace uses of hash_map with unordered_map
hash_map no longer exists in Visual C++ 2015. A=Brian Smith <brian@briansmith.org> R=ted at https://bugzilla.mozilla.org/show_bug.cgi?id=1119072 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1419 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
parent
7c7366dd6d
commit
d2904bb421
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
#include <atlcomcli.h>
|
#include <atlcomcli.h>
|
||||||
|
|
||||||
#include <hash_map>
|
#include <unordered_map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "common/windows/omap.h"
|
#include "common/windows/omap.h"
|
||||||
@ -47,7 +47,7 @@ struct IDiaSymbol;
|
|||||||
namespace google_breakpad {
|
namespace google_breakpad {
|
||||||
|
|
||||||
using std::wstring;
|
using std::wstring;
|
||||||
using stdext::hash_map;
|
using std::unordered_map;
|
||||||
|
|
||||||
// A structure that carries information that identifies a pdb file.
|
// A structure that carries information that identifies a pdb file.
|
||||||
struct PDBModuleInfo {
|
struct PDBModuleInfo {
|
||||||
@ -192,7 +192,7 @@ class PDBSourceLineWriter {
|
|||||||
|
|
||||||
// Store this ID in the cache as a duplicate for this filename.
|
// Store this ID in the cache as a duplicate for this filename.
|
||||||
void StoreDuplicateFileID(const wstring &file, DWORD id) {
|
void StoreDuplicateFileID(const wstring &file, DWORD id) {
|
||||||
hash_map<wstring, DWORD>::iterator iter = unique_files_.find(file);
|
unordered_map<wstring, DWORD>::iterator iter = unique_files_.find(file);
|
||||||
if (iter != unique_files_.end()) {
|
if (iter != unique_files_.end()) {
|
||||||
// map this id to the previously seen one
|
// map this id to the previously seen one
|
||||||
file_ids_[id] = iter->second;
|
file_ids_[id] = iter->second;
|
||||||
@ -204,7 +204,7 @@ class PDBSourceLineWriter {
|
|||||||
// but different unique IDs. The cache attempts to coalesce these into
|
// but different unique IDs. The cache attempts to coalesce these into
|
||||||
// one ID per unique filename.
|
// one ID per unique filename.
|
||||||
DWORD GetRealFileID(DWORD id) {
|
DWORD GetRealFileID(DWORD id) {
|
||||||
hash_map<DWORD, DWORD>::iterator iter = file_ids_.find(id);
|
unordered_map<DWORD, DWORD>::iterator iter = file_ids_.find(id);
|
||||||
if (iter == file_ids_.end())
|
if (iter == file_ids_.end())
|
||||||
return id;
|
return id;
|
||||||
return iter->second;
|
return iter->second;
|
||||||
@ -240,9 +240,9 @@ class PDBSourceLineWriter {
|
|||||||
// There may be many duplicate filenames with different IDs.
|
// There may be many duplicate filenames with different IDs.
|
||||||
// This maps from the DIA "unique ID" to a single ID per unique
|
// This maps from the DIA "unique ID" to a single ID per unique
|
||||||
// filename.
|
// filename.
|
||||||
hash_map<DWORD, DWORD> file_ids_;
|
unordered_map<DWORD, DWORD> file_ids_;
|
||||||
// This maps unique filenames to file IDs.
|
// This maps unique filenames to file IDs.
|
||||||
hash_map<wstring, DWORD> unique_files_;
|
unordered_map<wstring, DWORD> unique_files_;
|
||||||
|
|
||||||
// This is used for calculating post-transform symbol addresses and lengths.
|
// This is used for calculating post-transform symbol addresses and lengths.
|
||||||
ImageMap image_map_;
|
ImageMap image_map_;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user