diff options
Diffstat (limited to 'src/mongo/db/matcher/expression_parser_tree.cpp')
| -rw-r--r-- | src/mongo/db/matcher/expression_parser_tree.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mongo/db/matcher/expression_parser_tree.cpp b/src/mongo/db/matcher/expression_parser_tree.cpp index 58365df9ff6..3491d0ff734 100644 --- a/src/mongo/db/matcher/expression_parser_tree.cpp +++ b/src/mongo/db/matcher/expression_parser_tree.cpp @@ -41,7 +41,6 @@ namespace mongo { Status MatchExpressionParser::_parseTreeList(const BSONObj& arr, ListOfMatchExpression* out, - const CollatorInterface* collator, const boost::intrusive_ptr<ExpressionContext>& expCtx, AllowedFeatureSet allowedFeatures, bool topLevel) { @@ -55,8 +54,7 @@ Status MatchExpressionParser::_parseTreeList(const BSONObj& arr, if (e.type() != Object) return Status(ErrorCodes::BadValue, "$or/$and/$nor entries need to be full objects"); - StatusWithMatchExpression sub = - _parse(e.Obj(), collator, expCtx, allowedFeatures, topLevel); + StatusWithMatchExpression sub = _parse(e.Obj(), expCtx, allowedFeatures, topLevel); if (!sub.isOK()) return sub.getStatus(); @@ -68,7 +66,6 @@ Status MatchExpressionParser::_parseTreeList(const BSONObj& arr, StatusWithMatchExpression MatchExpressionParser::_parseNot( const char* name, const BSONElement& e, - const CollatorInterface* collator, const boost::intrusive_ptr<ExpressionContext>& expCtx, AllowedFeatureSet allowedFeatures, bool topLevel) { @@ -91,8 +88,7 @@ StatusWithMatchExpression MatchExpressionParser::_parseNot( return StatusWithMatchExpression(ErrorCodes::BadValue, "$not cannot be empty"); std::unique_ptr<AndMatchExpression> theAnd = stdx::make_unique<AndMatchExpression>(); - Status s = - _parseSub(name, notObject, theAnd.get(), collator, expCtx, allowedFeatures, topLevel); + Status s = _parseSub(name, notObject, theAnd.get(), expCtx, allowedFeatures, topLevel); if (!s.isOK()) return StatusWithMatchExpression(s); |