Bug 1187141 - Replace nsBaseHashtable::Enumerate() calls in storage/ …

…with iterators. r=mak.
Brli · Jan 25, 2016 · abf6838 · abf6838
1 parent 1c78cfa
commit abf6838
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/storage/StatementCache.h b/storage/StatementCache.h
@@ -79,7 +79,9 @@ class StatementCache {
   void
   FinalizeStatements()
   {
-    (void)mCachedStatements.Enumerate(FinalizeCachedStatements, nullptr);
+    for (auto iter = mCachedStatements.Iter(); !iter.Done(); iter.Next()) {
+      (void)iter.Data()->Finalize();
+    }
 
     // Clear the cache at this time too!
     (void)mCachedStatements.Clear();
@@ -89,15 +91,6 @@ class StatementCache {
   inline
   already_AddRefed<StatementType>
   CreateStatement(const nsACString& aQuery);
-  static
-  PLDHashOperator
-  FinalizeCachedStatements(const nsACString& aKey,
-                           nsCOMPtr<StatementType>& aStatement,
-                           void*)
-  {
-    (void)aStatement->Finalize();
-    return PL_DHASH_NEXT;
-  }
 
   nsInterfaceHashtable<nsCStringHashKey, StatementType> mCachedStatements;
   nsCOMPtr<mozIStorageConnection>& mConnection;