Changeset 261572 in webkit

Timestamp:

May 12, 2020 1:17:12 PM (4 years ago)

Author:

Ross Kirsling

Message:

Unreviewed PlayStation / clang-cl build fix following r261533.

clang for Windows (< v10.0.0) cannot destructure a const class.
See also r254471, r249524, etc.

• Modules/indexeddb/server/MemoryObjectStore.cpp:

(WebCore::IDBServer::MemoryObjectStore::updateIndexesForPutRecord):

• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

(WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/server/MemoryObjectStore.cpp (modified) (2 diffs)
• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-12  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed PlayStation / clang-cl build fix following r261533.
+
+        clang for Windows (< v10.0.0) cannot destructure a const class.
+        See also r254471, r249524, etc.
+
+        * Modules/indexeddb/server/MemoryObjectStore.cpp:
+        (WebCore::IDBServer::MemoryObjectStore::updateIndexesForPutRecord):
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):
+
 2020-05-12  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp

@@ -311 +311 @@
     Vector<std::pair<MemoryIndex*, IndexKey>> changedIndexRecords;
 
-    for (const auto& [indexID, indexKey] : indexKeys) {
-        auto* index = m_indexesByIdentifier.get(indexID);
+    for (const auto& entry : indexKeys) {
+        auto* index = m_indexesByIdentifier.get(entry.key);
         ASSERT(index);
         if (!index) {
@@ -319 +319 @@
         }
 
-        error = index->putIndexKey(key, indexKey);
+        error = index->putIndexKey(key, entry.value);
         if (!error.isNull())
             break;
 
-        changedIndexRecords.append(std::make_pair(index, indexKey));
+        changedIndexRecords.append(std::make_pair(index, entry.value));
     }
 

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -1859 +1859 @@
     bool anyRecordsSucceeded = false;
 
-    for (const auto& [indexID, indexKey] : indexKeys) {
-        auto indexIterator = indexMap.find(indexID);
+    for (const auto& entry : indexKeys) {
+        auto indexIterator = indexMap.find(entry.key);
         ASSERT(indexIterator != indexMap.end());
 
@@ -1868 +1868 @@
         }
 
-        error = uncheckedPutIndexKey(indexIterator->value, key, indexKey, recordID);
+        error = uncheckedPutIndexKey(indexIterator->value, key, entry.value, recordID);
         if (!error.isNull())
             break;