From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 7 May 2012 11:21:11 +0200
Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b
 (http://svn.webkit.org/repository/webkit/trunk@116286)

---
 Source/JavaScriptCore/tools/CodeProfiling.cpp | 2 +-
 Source/JavaScriptCore/tools/ProfileTreeNode.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Source/JavaScriptCore/tools')

diff --git a/Source/JavaScriptCore/tools/CodeProfiling.cpp b/Source/JavaScriptCore/tools/CodeProfiling.cpp
index f11603854..740595e3e 100644
--- a/Source/JavaScriptCore/tools/CodeProfiling.cpp
+++ b/Source/JavaScriptCore/tools/CodeProfiling.cpp
@@ -27,7 +27,7 @@
 #include "CodeProfiling.h"
 
 #include "CodeProfile.h"
-#include "MetaAllocator.h"
+#include <wtf/MetaAllocator.h>
 
 #if HAVE(SIGNAL_H)
 #include <signal.h>
diff --git a/Source/JavaScriptCore/tools/ProfileTreeNode.h b/Source/JavaScriptCore/tools/ProfileTreeNode.h
index 60d59928a..9de39ad8a 100644
--- a/Source/JavaScriptCore/tools/ProfileTreeNode.h
+++ b/Source/JavaScriptCore/tools/ProfileTreeNode.h
@@ -50,8 +50,8 @@ public:
             m_children = new Map();
     
         ProfileTreeNode newEntry;
-        pair<Map::iterator, bool> result = m_children->add(String(name), newEntry);
-        ProfileTreeNode* childInMap = &result.first->second;
+        Map::AddResult result = m_children->add(String(name), newEntry);
+        ProfileTreeNode* childInMap = &result.iterator->second;
         ++childInMap->m_count;
         return childInMap;
     }
-- 
cgit v1.2.1