Minor cleanups to firebase_assert.h (#1051)

Remove a duplicate macro definition and clean up an extra const clang-tidy complains about.

1 files changed, 2 insertions, 9 deletions

diff --git a/Firestore/core/src/firebase/firestore/util/firebase_assert.h b/Firestore/core/src/firebase/firestore/util/firebase_assert.h
index 7de1dda..6a9c2eb 100644
--- a/Firestore/core/src/firebase/firestore/util/firebase_assert.h
+++ b/Firestore/core/src/firebase/firestore/util/firebase_assert.h
@@ -76,10 +76,6 @@
     }                                                                       \
   } while (0)
 
-// Assert with custom message that is not compiled out in release builds.
-#define FIREBASE_ASSERT_MESSAGE(expression, ...) \
-  FIREBASE_ASSERT_MESSAGE_WITH_EXPRESSION(expression, expression, __VA_ARGS__)
-
 // Assert condition is true otherwise display the specified expression,
 // message and abort. Compiled out of release builds.
 #if defined(NDEBUG)
@@ -113,11 +109,8 @@ namespace firestore {
 namespace util {
 
 // A no-return helper function. To raise an assertion, use Macro instead.
-ABSL_ATTRIBUTE_NORETURN void FailAssert(const char* file,
-                                        const char* func,
-                                        const int line,
-                                        const char* format,
-                                        ...);
+ABSL_ATTRIBUTE_NORETURN void FailAssert(
+    const char* file, const char* func, int line, const char* format, ...);
 
 }  // namespace util
 }  // namespace firestore