Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/profiler/strings-storage.h b/src/profiler/strings-storage.h
index 0849d63..f98aa5e 100644
--- a/src/profiler/strings-storage.h
+++ b/src/profiler/strings-storage.h
@@ -5,9 +5,11 @@
#ifndef V8_PROFILER_STRINGS_STORAGE_H_
#define V8_PROFILER_STRINGS_STORAGE_H_
+#include <stdarg.h>
+
#include "src/allocation.h"
#include "src/base/compiler-specific.h"
-#include "src/hashmap.h"
+#include "src/base/hashmap.h"
namespace v8 {
namespace internal {
@@ -34,10 +36,10 @@
static bool StringsMatch(void* key1, void* key2);
const char* AddOrDisposeString(char* str, int len);
- HashMap::Entry* GetEntry(const char* str, int len);
+ base::HashMap::Entry* GetEntry(const char* str, int len);
uint32_t hash_seed_;
- HashMap names_;
+ base::HashMap names_;
DISALLOW_COPY_AND_ASSIGN(StringsStorage);
};