Commit ec857f40 authored by ben's avatar ben Committed by Commit bot

Stop using deprecated hash_map in vtune-jit.cc.

Previous attempt: https://codereview.chromium.org/1924403002

Review-Url: https://codereview.chromium.org/1937753002
Cr-Commit-Position: refs/heads/master@{#35942}
parent e2f94946
......@@ -55,26 +55,12 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#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 <stdlib.h>
#include <string.h>
#include <list>
#include <unordered_map>
#include "v8-vtune.h"
#include "vtune-jit.h"
......@@ -126,11 +112,8 @@ struct HashForCodeObject {
}
};
#ifdef WIN32
typedef hash_map<void*, void*> JitInfoMap;
#else
typedef hash_map<void*, void*, HashForCodeObject, SameCodeObjects> JitInfoMap;
#endif
typedef std::unordered_map<void*, void*, HashForCodeObject, SameCodeObjects>
JitInfoMap;
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