SERVER-25488 merge ClientBasic and Client

1 files changed, 3 insertions, 2 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index 6776239f036..179b0938d5b 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -100,7 +100,8 @@ int64_t generateSeed(const std::string& desc) {
 }  // namespace
 
 Client::Client(std::string desc, ServiceContext* serviceContext, transport::Session* session)
-    : ClientBasic(serviceContext, session),
+    : _serviceContext(serviceContext),
+      _session(session),
       _desc(std::move(desc)),
       _threadId(stdx::this_thread::get_id()),
       _connectionId(session ? session->id() : 0),
@@ -147,7 +148,7 @@ std::string Client::clientAddress(bool includePort) const {
     return getRemote().host();
 }
 
-ClientBasic* ClientBasic::getCurrent() {
+Client* Client::getCurrent() {
     return currentClient.getMake()->get();
 }