diff options
Diffstat (limited to 'src/mongo/shell/shell_utils_launcher.cpp')
| -rw-r--r-- | src/mongo/shell/shell_utils_launcher.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp index 62cfb509b9b..58b33fe83aa 100644 --- a/src/mongo/shell/shell_utils_launcher.cpp +++ b/src/mongo/shell/shell_utils_launcher.cpp @@ -338,12 +338,10 @@ ProgramRunner::ProgramRunner(const BSONObj& args, const BSONObj& env, bool isMon // we explicitly override them. #ifdef _WIN32 wchar_t* processEnv = GetEnvironmentStringsW(); - ON_BLOCK_EXIT( - [](wchar_t* toFree) { - if (toFree) - FreeEnvironmentStringsW(toFree); - }, - processEnv); + ON_BLOCK_EXIT([processEnv] { + if (processEnv) + FreeEnvironmentStringsW(processEnv); + }); // Windows' GetEnvironmentStringsW returns a NULL terminated array of NULL separated // <key>=<value> pairs. @@ -959,7 +957,7 @@ inline void kill_wrapper(ProcessId pid, int sig, int port, const BSONObj& opt) { return; } - ON_BLOCK_EXIT(CloseHandle, event); + ON_BLOCK_EXIT([&] { CloseHandle(event); }); bool result = SetEvent(event); if (!result) { |