summaryrefslogtreecommitdiff
path: root/src/mongo/base
diff options
context:
space:
mode:
authorBenety Goh <benety@mongodb.com>2018-12-22 07:02:18 -0500
committerBenety Goh <benety@mongodb.com>2018-12-22 07:02:30 -0500
commit7f70c1213b2cc79591ea1d11f9724d057886a0fd (patch)
tree6cc901b7fb7eb1fc83f61afe84f974853d6fbfd1 /src/mongo/base
parent1d67c9bd3481a1cc3c7e09362e5b549cda77a350 (diff)
downloadmongo-7f70c1213b2cc79591ea1d11f9724d057886a0fd.tar.gz
SERVER-38408 rename UUID::nil() to UUID::makeDefaultForChangeStream()
This fixes a name conflict with the 'nil' preprocessor macro defined in: https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/MacTypes.h.auto.html
Diffstat (limited to 'src/mongo/base')
-rw-r--r--src/mongo/base/uuid_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/base/uuid_test.cpp b/src/mongo/base/uuid_test.cpp
index 242c7102900..02e1f9fe4ed 100644
--- a/src/mongo/base/uuid_test.cpp
+++ b/src/mongo/base/uuid_test.cpp
@@ -193,7 +193,7 @@ TEST(UUIDTest, toBSONUsingBSONMacro) {
TEST(UUIDTest, NilUUID) {
// Test that UUID::nil() returns an all-zero UUID.
auto nilUUID = UUID::parse("00000000-0000-0000-0000-000000000000");
- ASSERT_EQUALS(UUID::nil(), unittest::assertGet(nilUUID));
+ ASSERT_EQUALS(UUID::makeDefaultForChangeStream(), unittest::assertGet(nilUUID));
}
} // namespace