From d439bbccd4b90583a89d209d2cc81308aabca8ac Mon Sep 17 00:00:00 2001 From: Gil Date: Tue, 22 May 2018 13:21:08 -0700 Subject: Add a HARD_ASSERT C++ assertion macro (#1304) * Add HARD_ASSERT * Use HARD_ASSERT * Remove FIREBASE_ASSERT * Remove StringPrintf --- Firestore/core/src/firebase/firestore/util/status.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'Firestore/core/src/firebase/firestore/util/status.h') diff --git a/Firestore/core/src/firebase/firestore/util/status.h b/Firestore/core/src/firebase/firestore/util/status.h index 13bf320..9121b36 100644 --- a/Firestore/core/src/firebase/firestore/util/status.h +++ b/Firestore/core/src/firebase/firestore/util/status.h @@ -23,7 +23,7 @@ #include #include "Firestore/core/include/firebase/firestore/firestore_errors.h" -#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h" +#include "Firestore/core/src/firebase/firestore/util/hard_assert.h" #include "absl/base/attributes.h" #include "absl/strings/string_view.h" @@ -124,15 +124,8 @@ typedef std::function StatusCallback; extern std::string StatusCheckOpHelperOutOfLine(const Status& v, const char* msg); -#define STATUS_CHECK_OK(val) \ - FIREBASE_ASSERT_MESSAGE_WITH_EXPRESSION( \ - val.ok(), val.ok(), StatusCheckOpHelperOutOfLine(val, #val).c_str()) - -// DEBUG only version of STATUS_CHECK_OK. Compiler still parses 'val' even in -// opt mode. -#define STATUS_DCHECK_OK(val) \ - FIREBASE_DEV_ASSERT_MESSAGE_WITH_EXPRESSION( \ - val.ok(), val.ok(), StatusCheckOpHelperOutOfLine(val, #val).c_str()) +#define STATUS_CHECK_OK(val) \ + HARD_ASSERT(val.ok(), "%s", StatusCheckOpHelperOutOfLine(val, #val)) } // namespace util } // namespace firestore -- cgit v1.2.3