SERVER-61420 Use ComparisonMatchExpressionBase for auto parameterization

2 files changed, 10 insertions, 10 deletions

diff --git a/src/mongo/db/matcher/expression_where.h b/src/mongo/db/matcher/expression_where.h
index a8a8090616e..84142435b16 100644
--- a/src/mongo/db/matcher/expression_where.h
+++ b/src/mongo/db/matcher/expression_where.h
@@ -56,22 +56,12 @@ public:
         return _jsFunction;
     }
 
-    void setInputParamId(InputParamId paramId) {
-        _inputParamId = paramId;
-    }
-
-    boost::optional<InputParamId> getInputParamId() const {
-        return _inputParamId;
-    }
-
 private:
     std::string _dbName;
 
     OperationContext* const _opCtx;
 
     JsFunction _jsFunction;
-
-    boost::optional<InputParamId> _inputParamId;
 };
 
 }  // namespace mongo
diff --git a/src/mongo/db/matcher/expression_where_base.h b/src/mongo/db/matcher/expression_where_base.h
index 8a548538943..1964d818931 100644
--- a/src/mongo/db/matcher/expression_where_base.h
+++ b/src/mongo/db/matcher/expression_where_base.h
@@ -72,6 +72,14 @@ public:
         return MatchCategory::kOther;
     }
 
+    void setInputParamId(InputParamId paramId) {
+        _inputParamId = paramId;
+    }
+
+    boost::optional<InputParamId> getInputParamId() const {
+        return _inputParamId;
+    }
+
 protected:
     const std::string& getCode() const {
         return _code;
@@ -83,6 +91,8 @@ private:
     }
 
     const std::string _code;
+
+    boost::optional<InputParamId> _inputParamId;
 };
 
 }  // namespace mongo