From 97821dfa13cccb5acad6faef0f536e3d5d77d678 Mon Sep 17 00:00:00 2001
From: Charlie Swanson <charlie.swanson@mongodb.com>
Date: Wed, 16 Jan 2019 20:15:37 -0500
Subject: Revert " SERVER-38311 Adjust $out merging strategy"

This reverts commit 0cb2195939494660334db8e9d0a52509caeb621c.
---
 src/mongo/db/pipeline/document_source_geo_near.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mongo/db/pipeline/document_source_geo_near.cpp')

diff --git a/src/mongo/db/pipeline/document_source_geo_near.cpp b/src/mongo/db/pipeline/document_source_geo_near.cpp
index e80feb995bd..4a9cee80e3f 100644
--- a/src/mongo/db/pipeline/document_source_geo_near.cpp
+++ b/src/mongo/db/pipeline/document_source_geo_near.cpp
@@ -237,9 +237,8 @@ DepsTracker::State DocumentSourceGeoNear::getDependencies(DepsTracker* deps) con
 DocumentSourceGeoNear::DocumentSourceGeoNear(const intrusive_ptr<ExpressionContext>& pExpCtx)
     : DocumentSource(pExpCtx), coordsIsArray(false), spherical(false) {}
 
-boost::optional<DocumentSource::MergingLogic> DocumentSourceGeoNear::mergingLogic() {
-    // {shardsStage, mergingStage, sortPattern}
-    return MergingLogic{this, nullptr, BSON(distanceField->fullPath() << 1)};
+NeedsMergerDocumentSource::MergingLogic DocumentSourceGeoNear::mergingLogic() {
+    return {nullptr, BSON(distanceField->fullPath() << 1)};
 }
 
 }  // namespace mongo
-- 
cgit v1.2.1