SERVER-68246 rewrite calls to boost::optional get and is_initialized

6 files changed, 10 insertions, 10 deletions

diff --git a/src/mongo/util/exit.cpp b/src/mongo/util/exit.cpp
index 14359a797f9..2a34fb9707f 100644
--- a/src/mongo/util/exit.cpp
+++ b/src/mongo/util/exit.cpp
@@ -71,7 +71,7 @@ void runTasks(decltype(shutdownTasks) tasks, const ShutdownTaskArgs& shutdownArg
 // prevent multiple threads from attempting to log that they are exiting. The quickExit() function
 // has its own 'quickExitMutex' to prohibit multiple threads from attempting to call _exit().
 MONGO_COMPILER_NORETURN void logAndQuickExit_inlock() {
-    ExitCode code = shutdownExitCode.get();
+    ExitCode code = shutdownExitCode.value();
     LOGV2(23138, "Shutting down with code: {exitCode}", "Shutting down", "exitCode"_attr = code);
     quickExit(code);
 }
@@ -93,7 +93,7 @@ ExitCode waitForShutdown() {
         return shutdownStarted && !shutdownTasksInProgress;
     });
 
-    return shutdownExitCode.get();
+    return shutdownExitCode.value();
 }
 
 void registerShutdownTask(unique_function<void(const ShutdownTaskArgs&)> task) {
@@ -115,7 +115,7 @@ void shutdown(ExitCode code, const ShutdownTaskArgs& shutdownArgs) {
             // Re-entrant calls to shutdown are not allowed.
             invariant(shutdownTasksThreadId != stdx::this_thread::get_id());
 
-            ExitCode originallyRequestedCode = shutdownExitCode.get();
+            ExitCode originallyRequestedCode = shutdownExitCode.value();
             if (code != originallyRequestedCode) {
                 LOGV2(23139,
                       "While running shutdown tasks with the intent to exit with code "
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index 1a9de937a6e..08c97811d08 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -363,10 +363,10 @@ void logSSLInfo(const SSLInformationToLog& info,
         logCert(info.server, "Server", logNumPEM);
     }
     if (info.cluster.has_value()) {
-        logCert(info.cluster.get(), "Cluster", logNumCluster);
+        logCert(info.cluster.value(), "Cluster", logNumCluster);
     }
     if (info.crl.has_value()) {
-        logCRL(info.crl.get(), logNumCrl);
+        logCRL(info.crl.value(), logNumCrl);
     }
 }
 
diff --git a/src/mongo/util/net/ssl_parameters.cpp b/src/mongo/util/net/ssl_parameters.cpp
index 2d6784a5539..60ed9f0921e 100644
--- a/src/mongo/util/net/ssl_parameters.cpp
+++ b/src/mongo/util/net/ssl_parameters.cpp
@@ -128,7 +128,7 @@ void TLSCATrustsSetParameter::append(OperationContext*,
 
     BSONArrayBuilder trusts;
 
-    for (const auto& cait : sslGlobalParams.tlsCATrusts.get()) {
+    for (const auto& cait : sslGlobalParams.tlsCATrusts.value()) {
         BSONArrayBuilder roles;
 
         for (const auto& rolename : cait.second) {
diff --git a/src/mongo/util/testing_proctor.cpp b/src/mongo/util/testing_proctor.cpp
index 82bc8fffe2e..d64741f4ea3 100644
--- a/src/mongo/util/testing_proctor.cpp
+++ b/src/mongo/util/testing_proctor.cpp
@@ -49,7 +49,7 @@ bool TestingProctor::isEnabled() const {
     uassert(ErrorCodes::NotYetInitialized,
             "Cannot check whether testing diagnostics is enabled before it is initialized",
             isInitialized());
-    return _diagnosticsEnabled.get();
+    return _diagnosticsEnabled.value();
 }
 
 void TestingProctor::setEnabled(bool enable) {
@@ -60,7 +60,7 @@ void TestingProctor::setEnabled(bool enable) {
 
     uassert(ErrorCodes::AlreadyInitialized,
             "Cannot alter testing diagnostics once initialized",
-            _diagnosticsEnabled.get() == enable);
+            _diagnosticsEnabled.value() == enable);
 
     LOGV2(4672601, "Overriding testing diagnostics", "enabled"_attr = enable);
 }
diff --git a/src/mongo/util/tracing_support.cpp b/src/mongo/util/tracing_support.cpp
index 5ce6b4f6133..afc60501ca0 100644
--- a/src/mongo/util/tracing_support.cpp
+++ b/src/mongo/util/tracing_support.cpp
@@ -156,7 +156,7 @@ void TracerProvider::initialize(std::unique_ptr<ClockSource> clkSource) {  // NO
 TracerProvider& TracerProvider::get() {  // NOLINT
     auto& provider = getTraceProvider();
     invariant(provider.has_value(), "not initialized");
-    return provider.get();
+    return provider.value();
 }
 
 std::shared_ptr<Tracer> TracerProvider::getTracer(std::string name) {
diff --git a/src/mongo/util/tracing_support_test.cpp b/src/mongo/util/tracing_support_test.cpp
index 92e6d3b42df..5e889ba2c1a 100644
--- a/src/mongo/util/tracing_support_test.cpp
+++ b/src/mongo/util/tracing_support_test.cpp
@@ -130,7 +130,7 @@ TEST(TracingSupportTest, BasicUsage) {
                                                       << startTime + 4 * kSpanDuration))
                             << "stopped" << startTime + 4 * kSpanDuration))
                 << "stopped" << startTime + 4 * kSpanDuration));
-    ASSERT_BSONOBJ_EQ(expected, trace.get());
+    ASSERT_BSONOBJ_EQ(expected, trace.value());
 }
 
 }  // namespace mongo