SERVER-59782 migrate makeGuard calls to ScopeGuard

2 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/client/dbclient_connection.cpp b/src/mongo/client/dbclient_connection.cpp
index 9770437645b..48b7977992c 100644
--- a/src/mongo/client/dbclient_connection.cpp
+++ b/src/mongo/client/dbclient_connection.cpp
@@ -704,7 +704,7 @@ DBClientConnection::DBClientConnection(bool _autoReconnect,
 
 void DBClientConnection::say(Message& toSend, bool isRetry, string* actualServer) {
     checkConnection();
-    auto killSessionOnError = makeGuard([this] { _markFailed(kEndSession); });
+    ScopeGuard killSessionOnError([this] { _markFailed(kEndSession); });
 
     toSend.header().setId(nextMessageId());
     toSend.header().setResponseToMsgId(0);
@@ -723,7 +723,7 @@ void DBClientConnection::say(Message& toSend, bool isRetry, string* actualServer
 }
 
 Status DBClientConnection::recv(Message& m, int lastRequestId) {
-    auto killSessionOnError = makeGuard([this] { _markFailed(kEndSession); });
+    ScopeGuard killSessionOnError([this] { _markFailed(kEndSession); });
     auto swm = _session->sourceMessage();
     if (!swm.isOK()) {
         return swm.getStatus();
@@ -747,7 +747,7 @@ bool DBClientConnection::call(Message& toSend,
                               bool assertOk,
                               string* actualServer) {
     checkConnection();
-    auto killSessionOnError = makeGuard([this] { _markFailed(kEndSession); });
+    ScopeGuard killSessionOnError([this] { _markFailed(kEndSession); });
     auto maybeThrow = [&](const auto& errStatus) {
         if (assertOk)
             uassertStatusOKWithContext(errStatus,
diff --git a/src/mongo/client/fetcher.cpp b/src/mongo/client/fetcher.cpp
index 4dc580c5d12..75cbf7f1d0d 100644
--- a/src/mongo/client/fetcher.cpp
+++ b/src/mongo/client/fetcher.cpp
@@ -339,7 +339,7 @@ Status Fetcher::_scheduleGetMore(const BSONObj& cmdObj) {
 
 void Fetcher::_callback(const RemoteCommandCallbackArgs& rcbd, const char* batchFieldName) {
     QueryResponse batchData;
-    auto finishCallbackGuard = makeGuard([this, &batchData] {
+    ScopeGuard finishCallbackGuard([this, &batchData] {
         if (batchData.cursorId && !batchData.nss.isEmpty()) {
             _sendKillCursors(batchData.cursorId, batchData.nss);
         }