Changeset 161741 in webkit

Timestamp:

Jan 10, 2014, 10:02:00 PM (12 years ago)

Author:

Joseph Pecoraro

Message:

Fix TileGrid.o for iOS. Unreviewed build fix.

Explicitly use namespace std in std::pair.

• platform/ios/TileGrid.mm:

(WebCore::isFartherAway):
(WebCore::TileGrid::dropDistantTiles):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/TileGrid.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Fix TileGrid.o for iOS. Unreviewed build fix.
+
+        Explicitly use namespace std in std::pair.
+
+        * platform/ios/TileGrid.mm:
+        (WebCore::isFartherAway):
+        (WebCore::TileGrid::dropDistantTiles):
+
 2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/platform/ios/TileGrid.mm

@@ -105 +105 @@
 
 template <typename T>
-static bool isFartherAway(const pair<double, T>& a, const pair<double, T>& b)
+static bool isFartherAway(const std::pair<double, T>& a, const std::pair<double, T>& b)
 {
     return a.first > b.first;
@@ -124 +124 @@
 
     IntRect visibleRect = this->visibleRect();
-    Vector<pair<double, TileIndex>> toRemove;
+    Vector<std::pair<double, TileIndex>> toRemove;
     for (auto tile : m_tiles) {
         TileIndex& index = tile.key;