Skip to content

Commit 87fb823

Browse files
committed
SERVER-34364 remove invariantOK and dassertOK
1 parent 810b253 commit 87fb823

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

src/mongo/util/assert_util.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -440,20 +440,6 @@ inline void massertStatusOKWithLocation(const Status& status, const char* file,
440440
} \
441441
} while (false)
442442

443-
#define invariantOK MONGO_invariantOK
444-
#define MONGO_invariantOK(expression) \
445-
do { \
446-
const ::mongo::Status _invariantOK_status = expression; \
447-
if (MONGO_unlikely(!_invariantOK_status.isOK())) { \
448-
::mongo::invariantOKFailed(#expression, _invariantOK_status, __FILE__, __LINE__); \
449-
} \
450-
} while (false)
451-
452-
#define dassertOK MONGO_dassertOK
453-
#define MONGO_dassertOK(expression) \
454-
if (kDebugBuild) \
455-
invariantOK(expression)
456-
457443
inline void invariantWithLocation(const Status& status,
458444
const char* expr,
459445
const char* file,

src/mongo/util/assert_util_test.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,6 @@ DEATH_TEST(InvariantTerminationTest, invariantStatusWithOverload, "Terminating w
299299
"Terminating with invariantStatusWithOverload"));
300300
}
301301

302-
DEATH_TEST(InvariantTerminationTest, invariantOK, "Terminating with invariantOK") {
303-
invariantOK(Status(ErrorCodes::InternalError, "Terminating with invariantOK"));
304-
}
305-
306302
DEATH_TEST(InvariantTerminationTest,
307303
invariantWithStringLiteralMsg,
308304
"Terminating with string literal invariant message") {

0 commit comments

Comments
 (0)