summaryrefslogtreecommitdiff
path: root/src/mongo/db/matcher/expression_parser.h
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2017-07-11 19:18:39 -0400
committerDavid Storch <david.storch@10gen.com>2017-07-20 19:01:31 -0400
commitc69b19ff673242230fecb27fff422f552b4f48d3 (patch)
treed42fa9aa3bded2d2e3c0169193394aadaaf10e59 /src/mongo/db/matcher/expression_parser.h
parent032bcef34fce7a9bd9ced1652be4bfa79d1a3e6d (diff)
downloadmongo-c69b19ff673242230fecb27fff422f552b4f48d3.tar.gz
SERVER-29840 Merge libexpressions and libexpressions_geo.
Removes expressionParserGeoCallback.
Diffstat (limited to 'src/mongo/db/matcher/expression_parser.h')
-rw-r--r--src/mongo/db/matcher/expression_parser.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mongo/db/matcher/expression_parser.h b/src/mongo/db/matcher/expression_parser.h
index b6a7f9c21c6..c41e93ae5b1 100644
--- a/src/mongo/db/matcher/expression_parser.h
+++ b/src/mongo/db/matcher/expression_parser.h
@@ -167,6 +167,8 @@ private:
StatusWithMatchExpression _parseType(const char* name, const BSONElement& elt);
+ StatusWithMatchExpression _parseGeo(const char* name, int type, const BSONObj& section);
+
// arrays
StatusWithMatchExpression _parseElemMatch(const char* name,
@@ -214,9 +216,4 @@ private:
// as long as the parser is active.
const ExtensionsCallback* _extensionsCallback;
};
-
-typedef stdx::function<StatusWithMatchExpression(
- const char* name, int type, const BSONObj& section)>
- MatchExpressionParserGeoCallback;
-extern MatchExpressionParserGeoCallback expressionParserGeoCallback;
-}
+} // namespace mongo