diff options
| author | Benety Goh <benety@mongodb.com> | 2018-12-22 07:02:18 -0500 |
|---|---|---|
| committer | Benety Goh <benety@mongodb.com> | 2018-12-22 07:02:30 -0500 |
| commit | 7f70c1213b2cc79591ea1d11f9724d057886a0fd (patch) | |
| tree | 6cc901b7fb7eb1fc83f61afe84f974853d6fbfd1 /src/mongo/util/uuid.cpp | |
| parent | 1d67c9bd3481a1cc3c7e09362e5b549cda77a350 (diff) | |
| download | mongo-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/util/uuid.cpp')
| -rw-r--r-- | src/mongo/util/uuid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/util/uuid.cpp b/src/mongo/util/uuid.cpp index 290134dc88c..6df2b6853a9 100644 --- a/src/mongo/util/uuid.cpp +++ b/src/mongo/util/uuid.cpp @@ -89,7 +89,7 @@ UUID UUID::parse(const BSONObj& obj) { return res.getValue(); } -UUID UUID::nil() { +UUID UUID::makeDefaultForChangeStream() { return UUID{}; } |