Commit 987bd9cc authored by bmeurer's avatar bmeurer Committed by Commit bot

Revert of Stop using deprecated hash_map in vtune-jit.cc. (patchset #1 id:1 of...

Revert of Stop using deprecated hash_map in vtune-jit.cc. (patchset #1 id:1 of https://codereview.chromium.org/1924403002/ )

Reason for revert:
Breaks vtune-jit build, see https://build.chromium.org/p/client.v8/builders/V8%20Linux%20-%20vtunejit/builds/10670

Original issue's description:
> Stop using deprecated hash_map in vtune-jit.cc.
>
> Fixes https://github.com/nodejs/node/issues/6422.

TBR=jochen@chromium.org,info@bnoordhuis.nl,ben@strongloop.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/1940693002
Cr-Commit-Position: refs/heads/master@{#35917}
parent 54c47545
......@@ -57,8 +57,24 @@
*/
#include <string.h>
#ifdef WIN32
#include <hash_map>
using namespace std;
#else
// To avoid GCC 4.4 compilation warning about hash_map being deprecated.
#define OLD_DEPRECATED __DEPRECATED
#undef __DEPRECATED
#if defined (ANDROID)
#include <hash_map>
using namespace std;
#else
#include <ext/hash_map>
using namespace __gnu_cxx;
#endif
#define __DEPRECATED OLD_DEPRECATED
#endif
#include <list>
#include <unordered_map>
#include "v8-vtune.h"
#include "vtune-jit.h"
......@@ -110,8 +126,11 @@ struct HashForCodeObject {
}
};
typedef std::unordered_map<void*, void*, HashForCodeObject, SameCodeObjects>
JitInfoMap;
#ifdef WIN32
typedef hash_map<void*, void*> JitInfoMap;
#else
typedef hash_map<void*, void*, HashForCodeObject, SameCodeObjects> JitInfoMap;
#endif
static JitInfoMap* GetEntries() {
static JitInfoMap* entries;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment