Index: src/third_party/vtune/vtune-jit.cc |
diff --git a/src/third_party/vtune/vtune-jit.cc b/src/third_party/vtune/vtune-jit.cc |
index 30f6196001930fdf07d6e390b22243572fb0e517..0bd19546ac105df6acc4efa57af6c6150b4f0d35 100644 |
--- a/src/third_party/vtune/vtune-jit.cc |
+++ b/src/third_party/vtune/vtune-jit.cc |
@@ -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; |