Index: Source/core/inspector/DOMPatchSupport.cpp |
diff --git a/Source/core/inspector/DOMPatchSupport.cpp b/Source/core/inspector/DOMPatchSupport.cpp |
index cc2d89df7407042e04489bf488ba358efb4a5bf9..e853b2fc6919aea1b499dee016d4c8eeec226cce 100644 |
--- a/Source/core/inspector/DOMPatchSupport.cpp |
+++ b/Source/core/inspector/DOMPatchSupport.cpp |
@@ -54,6 +54,8 @@ |
#include "wtf/text/Base64.h" |
#include "wtf/text/CString.h" |
+using namespace std; |
+ |
namespace WebCore { |
struct DOMPatchSupport::Digest { |
@@ -263,8 +265,8 @@ |
if (oldIt == oldTable.end() || oldIt->value.size() != 1) |
continue; |
- newMap[newIt->value[0]] = std::make_pair(newList[newIt->value[0]].get(), oldIt->value[0]); |
- oldMap[oldIt->value[0]] = std::make_pair(oldList[oldIt->value[0]].get(), newIt->value[0]); |
+ newMap[newIt->value[0]] = make_pair(newList[newIt->value[0]].get(), oldIt->value[0]); |
+ oldMap[oldIt->value[0]] = make_pair(oldList[oldIt->value[0]].get(), newIt->value[0]); |
} |
for (size_t i = 0; newList.size() > 0 && i < newList.size() - 1; ++i) { |
@@ -273,8 +275,8 @@ |
size_t j = newMap[i].second + 1; |
if (j < oldMap.size() && !oldMap[j].first && newList[i + 1]->m_sha1 == oldList[j]->m_sha1) { |
- newMap[i + 1] = std::make_pair(newList[i + 1].get(), j); |
- oldMap[j] = std::make_pair(oldList[j].get(), i + 1); |
+ newMap[i + 1] = make_pair(newList[i + 1].get(), j); |
+ oldMap[j] = make_pair(oldList[j].get(), i + 1); |
} |
} |
@@ -284,8 +286,8 @@ |
size_t j = newMap[i].second - 1; |
if (!oldMap[j].first && newList[i - 1]->m_sha1 == oldList[j]->m_sha1) { |
- newMap[i - 1] = std::make_pair(newList[i - 1].get(), j); |
- oldMap[j] = std::make_pair(oldList[j].get(), i - 1); |
+ newMap[i - 1] = make_pair(newList[i - 1].get(), j); |
+ oldMap[j] = make_pair(oldList[j].get(), i - 1); |
} |
} |
@@ -294,7 +296,7 @@ |
dumpMap(newMap, "NEW"); |
#endif |
- return std::make_pair(oldMap, newMap); |
+ return make_pair(oldMap, newMap); |
} |
bool DOMPatchSupport::innerPatchChildren(ContainerNode* parentNode, const Vector<OwnPtr<Digest> >& oldList, const Vector<OwnPtr<Digest> >& newList, ExceptionState& exceptionState) |