From 8037a4bf79b8ae49162c2b6f099d62ec17a7f283 Mon Sep 17 00:00:00 2001 From: Gil Date: Thu, 24 May 2018 11:00:23 -0700 Subject: Replace Objective-C assertions with C++ assertions (#1327) * Migrate FSTFail to HARD_FAIL * FSTCFail -> HARD_FAIL * FSTCAssert -> HARD_ASSERT * FSTAssert -> HARD_ASSERT * Replace FSTAssert with NSAssert in dead Objective-C code * Remove FSTAssert.h --- Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm') diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm index f655e3a..534d2a4 100644 --- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm +++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm @@ -26,10 +26,10 @@ #import "Firestore/Source/Model/FSTDocument.h" #import "Firestore/Source/Model/FSTDocumentDictionary.h" #import "Firestore/Source/Model/FSTDocumentSet.h" -#import "Firestore/Source/Util/FSTAssert.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_transaction.h" #include "Firestore/core/src/firebase/firestore/model/document_key.h" +#include "Firestore/core/src/firebase/firestore/util/hard_assert.h" #include "leveldb/db.h" #include "leveldb/write_batch.h" @@ -77,8 +77,8 @@ using leveldb::Status; } else if (status.ok()) { return [self decodeMaybeDocument:value withKey:documentKey]; } else { - FSTFail(@"Fetch document for key (%s) failed with status: %s", documentKey.ToString().c_str(), - status.ToString().c_str()); + HARD_FAIL("Fetch document for key (%s) failed with status: %s", documentKey.ToString(), + status.ToString()); } } @@ -118,13 +118,13 @@ using leveldb::Status; NSError *error; FSTPBMaybeDocument *proto = [FSTPBMaybeDocument parseFromData:data error:&error]; if (!proto) { - FSTFail(@"FSTPBMaybeDocument failed to parse: %@", error); + HARD_FAIL("FSTPBMaybeDocument failed to parse: %s", error); } FSTMaybeDocument *maybeDocument = [self.serializer decodedMaybeDocument:proto]; - FSTAssert([maybeDocument.key isEqualToKey:documentKey], - @"Read document has key (%s) instead of expected key (%s).", - maybeDocument.key.ToString().c_str(), documentKey.ToString().c_str()); + HARD_ASSERT([maybeDocument.key isEqualToKey:documentKey], + "Read document has key (%s) instead of expected key (%s).", + maybeDocument.key.ToString(), documentKey.ToString()); return maybeDocument; } -- cgit v1.2.3