SERVER-29012 Enable ASAN strict init order checking and fix revealed issues

2 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/executor/remote_command_request.cpp b/src/mongo/executor/remote_command_request.cpp
index e5362f17386..be22658d2e4 100644
--- a/src/mongo/executor/remote_command_request.cpp
+++ b/src/mongo/executor/remote_command_request.cpp
@@ -46,8 +46,8 @@ AtomicUInt64 requestIdCounter(0);
 
 }  // namespace
 
-const Milliseconds RemoteCommandRequest::kNoTimeout{-1};
-const Date_t RemoteCommandRequest::kNoExpirationDate{Date_t::max()};
+constexpr Milliseconds RemoteCommandRequest::kNoTimeout;
+constexpr Date_t RemoteCommandRequest::kNoExpirationDate;
 
 RemoteCommandRequest::RemoteCommandRequest() : id(requestIdCounter.addAndFetch(1)) {}
 
diff --git a/src/mongo/executor/remote_command_request.h b/src/mongo/executor/remote_command_request.h
index e2e16b95261..c6195311b69 100644
--- a/src/mongo/executor/remote_command_request.h
+++ b/src/mongo/executor/remote_command_request.h
@@ -45,10 +45,10 @@ namespace executor {
  */
 struct RemoteCommandRequest {
     // Indicates that there is no timeout for the request to complete
-    static const Milliseconds kNoTimeout;
+    static constexpr Milliseconds kNoTimeout{-1};
 
     // Indicates that there is no expiration time by when the request needs to complete
-    static const Date_t kNoExpirationDate;
+    static constexpr Date_t kNoExpirationDate{Date_t::max()};
 
     // Type to represent the internal id of this request
     typedef uint64_t RequestId;