diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2020-10-08 04:54:40 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-08 10:44:32 +0000 |
| commit | f6174fa2dcec85dd1ac79d184a90557e101a4b3f (patch) | |
| tree | fa9454a33e2d9651494b2151ca5123086534ecc5 | |
| parent | d81fb9e5c454f89b6c41099c8b8ce09c463344c6 (diff) | |
| download | mongo-f6174fa2dcec85dd1ac79d184a90557e101a4b3f.tar.gz | |
SERVER-48863 Fix broken Windows compile
| -rw-r--r-- | src/mongo/db/cst/bson_lexer.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/cst/parser_gen.hpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/cst/bson_lexer.cpp b/src/mongo/db/cst/bson_lexer.cpp index 4accfa76bb3..eaffb06752f 100644 --- a/src/mongo/db/cst/bson_lexer.cpp +++ b/src/mongo/db/cst/bson_lexer.cpp @@ -212,7 +212,7 @@ const StringMap<ParserGen::token_type> reservedKeyFieldnameLookup = { {"$concatArrays", ParserGen::token::CONCAT_ARRAYS}, {"$filter", ParserGen::token::FILTER}, {"$first", ParserGen::token::FIRST}, - {"$in", ParserGen::token::IN}, + {"$in", ParserGen::token::IN_}, {"$indexOfArray", ParserGen::token::INDEX_OF_ARRAY}, {"$isArray", ParserGen::token::IS_ARRAY}, {"as", ParserGen::token::ARG_AS}, diff --git a/src/mongo/db/cst/parser_gen.hpp b/src/mongo/db/cst/parser_gen.hpp index c9164e1d14a..edab3a2746a 100644 --- a/src/mongo/db/cst/parser_gen.hpp +++ b/src/mongo/db/cst/parser_gen.hpp @@ -820,7 +820,7 @@ public: GTE = 90, // GTE HOUR = 91, // HOUR ID = 92, // ID - IN = 93, // IN + IN_ = 93, // IN INDEX_KEY = 94, // "indexKey" INDEX_OF_ARRAY = 95, // INDEX_OF_ARRAY INDEX_OF_BYTES = 96, // INDEX_OF_BYTES @@ -2480,7 +2480,7 @@ public: tok == token::EXPONENT || tok == token::EXPR || tok == token::FILTER || tok == token::FIRST || tok == token::FLOOR || tok == token::GEO_NEAR_DISTANCE || tok == token::GEO_NEAR_POINT || tok == token::GT || tok == token::GTE || - tok == token::HOUR || tok == token::ID || tok == token::IN || + tok == token::HOUR || tok == token::ID || tok == token::IN_ || tok == token::INDEX_KEY || tok == token::INDEX_OF_ARRAY || tok == token::INDEX_OF_BYTES || tok == token::INDEX_OF_CP || tok == token::INT_NEGATIVE_ONE || tok == token::INT_ONE || tok == token::INT_ZERO || @@ -2558,7 +2558,7 @@ public: tok == token::EXPONENT || tok == token::EXPR || tok == token::FILTER || tok == token::FIRST || tok == token::FLOOR || tok == token::GEO_NEAR_DISTANCE || tok == token::GEO_NEAR_POINT || tok == token::GT || tok == token::GTE || - tok == token::HOUR || tok == token::ID || tok == token::IN || + tok == token::HOUR || tok == token::ID || tok == token::IN_ || tok == token::INDEX_KEY || tok == token::INDEX_OF_ARRAY || tok == token::INDEX_OF_BYTES || tok == token::INDEX_OF_CP || tok == token::INT_NEGATIVE_ONE || tok == token::INT_ONE || tok == token::INT_ZERO || @@ -3698,11 +3698,11 @@ public: #endif #if 201103L <= YY_CPLUSPLUS static symbol_type make_IN(location_type l) { - return symbol_type(token::IN, std::move(l)); + return symbol_type(token::IN_, std::move(l)); } #else static symbol_type make_IN(const location_type& l) { - return symbol_type(token::IN, l); + return symbol_type(token::IN_, l); } #endif #if 201103L <= YY_CPLUSPLUS |