SERVER-45524 remove support for logging void * types

5 files changed, 6 insertions, 14 deletions

diff --git a/src/mongo/db/concurrency/lock_manager.cpp b/src/mongo/db/concurrency/lock_manager.cpp
index a7d3671c630..0ab21e4c425 100644
--- a/src/mongo/db/concurrency/lock_manager.cpp
+++ b/src/mongo/db/concurrency/lock_manager.cpp
@@ -826,7 +826,7 @@ LockManager::Partition* LockManager::_getPartition(LockRequest* request) const {
 }
 
 void LockManager::dump() const {
-    log() << "Dumping LockManager @ " << static_cast<const void*>(this) << '\n';
+    log() << "Dumping LockManager @ " << reinterpret_cast<uint64_t>(this) << '\n';
 
     auto lockToClientMap = getLockToClientMap(getGlobalServiceContext());
     for (unsigned i = 0; i < _numLockBuckets; i++) {
diff --git a/src/mongo/db/service_context.cpp b/src/mongo/db/service_context.cpp
index 511208ddc94..760efa6c4e8 100644
--- a/src/mongo/db/service_context.cpp
+++ b/src/mongo/db/service_context.cpp
@@ -111,7 +111,7 @@ ServiceContext::~ServiceContext() {
     stdx::lock_guard<Latch> lk(_mutex);
     for (const auto& client : _clients) {
         severe() << "Client " << client->desc() << " still exists while destroying ServiceContext@"
-                 << static_cast<void*>(this);
+                 << reinterpret_cast<uint64_t>(this);
     }
     invariant(_clients.empty());
 }
diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h
index 2ea07987521..ba5cb2ef689 100644
--- a/src/mongo/logger/logstream_builder.h
+++ b/src/mongo/logger/logstream_builder.h
@@ -162,14 +162,6 @@ public:
         stream() << x;
         return *this;
     }
-    LogstreamBuilder& operator<<(void* x) {
-        stream() << x;
-        return *this;
-    }
-    LogstreamBuilder& operator<<(const void* x) {
-        stream() << x;
-        return *this;
-    }
     LogstreamBuilder& operator<<(long long x) {
         stream() << x;
         return *this;
diff --git a/src/mongo/scripting/mozjs/engine.cpp b/src/mongo/scripting/mozjs/engine.cpp
index 4a8427d7dd9..bac89aaef86 100644
--- a/src/mongo/scripting/mozjs/engine.cpp
+++ b/src/mongo/scripting/mozjs/engine.cpp
@@ -147,7 +147,7 @@ void MozJSScriptEngine::registerOperation(OperationContext* opCtx, MozJSImplScop
 
     _opToScopeMap[opId] = scope;
 
-    LOG(2) << "SMScope " << static_cast<const void*>(scope) << " registered for op " << opId;
+    LOG(2) << "SMScope " << reinterpret_cast<uint64_t>(scope) << " registered for op " << opId;
     Status status = opCtx->checkForInterruptNoAssert();
     if (!status.isOK()) {
         scope->kill();
@@ -157,7 +157,7 @@ void MozJSScriptEngine::registerOperation(OperationContext* opCtx, MozJSImplScop
 void MozJSScriptEngine::unregisterOperation(unsigned int opId) {
     stdx::lock_guard<Latch> giLock(_globalInterruptLock);
 
-    LOG(2) << "ImplScope " << static_cast<const void*>(this) << " unregistered for op " << opId;
+    LOG(2) << "ImplScope " << reinterpret_cast<uint64_t>(this) << " unregistered for op " << opId;
 
     if (opId != 0) {
         // scope is currently associated with an operation id
diff --git a/src/mongo/util/stacktrace_test.cpp b/src/mongo/util/stacktrace_test.cpp
index 6340977c9c3..0140fce002d 100644
--- a/src/mongo/util/stacktrace_test.cpp
+++ b/src/mongo/util/stacktrace_test.cpp
@@ -504,7 +504,7 @@ public:
         unittest::log() << "tid:" << ostr(stdx::this_thread::get_id()) << ", caught signal " << sig
                         << "!\n";
         char storage;
-        unittest::log() << "local var:" << (const void*)&storage << "\n";
+        unittest::log() << "local var:" << reinterpret_cast<uint64_t>(&storage) << "\n";
     }
 
     static void tryHandler(void (*handler)(int, siginfo_t*, void*)) {
@@ -872,7 +872,7 @@ TEST(StackTrace, BacktraceThroughLibc) {
     });
     unittest::log() << "caught [" << capture.arrSize << "]:";
     for (size_t i = 0; i < capture.arrSize; ++i) {
-        unittest::log() << "  [" << i << "] " << capture.arr[i];
+        unittest::log() << "  [" << i << "] " << reinterpret_cast<uint64_t>(capture.arr[i]);
     }
 }
 #endif  // mongo stacktrace backend