diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2022-03-15 22:40:57 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-20 22:04:56 +0000 |
| commit | 829a112787ec85d89388f6fff1ece798508b309b (patch) | |
| tree | 99afe8b43c5fd58a23a7728525ea18bf56cc705d /src/mongo/base | |
| parent | f0f9428b2f1cf7526807dc3f49fdada4ef98d30d (diff) | |
| download | mongo-829a112787ec85d89388f6fff1ece798508b309b.tar.gz | |
SERVER-56571 rename and unprotect invariant.h
Diffstat (limited to 'src/mongo/base')
| -rw-r--r-- | src/mongo/base/checked_cast.h | 4 | ||||
| -rw-r--r-- | src/mongo/base/status.h | 5 | ||||
| -rw-r--r-- | src/mongo/base/status_with.h | 6 | ||||
| -rw-r--r-- | src/mongo/base/string_data.h | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/src/mongo/base/checked_cast.h b/src/mongo/base/checked_cast.h index a7be37a2548..2d61b9b5ab9 100644 --- a/src/mongo/base/checked_cast.h +++ b/src/mongo/base/checked_cast.h @@ -34,9 +34,7 @@ #include "mongo/util/debug_util.h" -#define MONGO_ALLOW_INCLUDE_INVARIANT_H -#include "mongo/util/invariant.h" -#undef MONGO_ALLOW_INCLUDE_INVARIANT_H +#include "mongo/util/assert_util_core.h" namespace mongo { diff --git a/src/mongo/base/status.h b/src/mongo/base/status.h index fedc414777c..d5f79718d87 100644 --- a/src/mongo/base/status.h +++ b/src/mongo/base/status.h @@ -41,13 +41,10 @@ #include "mongo/base/string_data.h" #include "mongo/bson/util/builder_fwd.h" #include "mongo/platform/compiler.h" +#include "mongo/util/assert_util_core.h" #include "mongo/util/intrusive_counter.h" #include "mongo/util/static_immortal.h" -#define MONGO_ALLOW_INCLUDE_INVARIANT_H -#include "mongo/util/invariant.h" -#undef MONGO_ALLOW_INCLUDE_INVARIANT_H - namespace mongo { /** diff --git a/src/mongo/base/status_with.h b/src/mongo/base/status_with.h index de98e7d6d39..fe85fa3f48d 100644 --- a/src/mongo/base/status_with.h +++ b/src/mongo/base/status_with.h @@ -38,11 +38,7 @@ #include "mongo/base/status.h" #include "mongo/bson/util/builder_fwd.h" #include "mongo/platform/compiler.h" - -#define MONGO_ALLOW_INCLUDE_INVARIANT_H -#include "mongo/util/invariant.h" -#undef MONGO_ALLOW_INCLUDE_INVARIANT_H - +#include "mongo/util/assert_util_core.h" namespace mongo { diff --git a/src/mongo/base/string_data.h b/src/mongo/base/string_data.h index eeda23aa3e9..ad26243afc0 100644 --- a/src/mongo/base/string_data.h +++ b/src/mongo/base/string_data.h @@ -40,11 +40,9 @@ #include "mongo/platform/compiler.h" #include "mongo/stdx/type_traits.h" +#include "mongo/util/assert_util_core.h" #include "mongo/util/ctype.h" #include "mongo/util/debug_util.h" -#define MONGO_ALLOW_INCLUDE_INVARIANT_H -#include "mongo/util/invariant.h" -#undef MONGO_ALLOW_INCLUDE_INVARIANT_H namespace mongo { |