SERVER-29482 Fix ODR violation in databases_cloner.h

2 files changed, 5 insertions, 11 deletions

diff --git a/src/mongo/db/repl/databases_cloner.cpp b/src/mongo/db/repl/databases_cloner.cpp
index 0d4d1217267..2a4e47edbf2 100644
--- a/src/mongo/db/repl/databases_cloner.cpp
+++ b/src/mongo/db/repl/databases_cloner.cpp
@@ -268,7 +268,8 @@ void DatabasesCloner::_setAdminAsFirst(std::vector<BSONElement>& dbsArray) {
     }
 }
 
-void DatabasesCloner::_onListDatabaseFinish(const CommandCallbackArgs& cbd) {
+void DatabasesCloner::_onListDatabaseFinish(
+    const executor::TaskExecutor::RemoteCommandCallbackArgs& cbd) {
     Status respStatus = cbd.response.status;
     if (respStatus.isOK()) {
         respStatus = getStatusFromCommandResult(cbd.response.data);
diff --git a/src/mongo/db/repl/databases_cloner.h b/src/mongo/db/repl/databases_cloner.h
index 13f11f1e2a1..f47ef569614 100644
--- a/src/mongo/db/repl/databases_cloner.h
+++ b/src/mongo/db/repl/databases_cloner.h
@@ -51,13 +51,6 @@ namespace mongo {
 class OldThreadPool;
 
 namespace repl {
-namespace {
-
-using CBHStatus = StatusWith<executor::TaskExecutor::CallbackHandle>;
-using CommandCallbackArgs = executor::TaskExecutor::RemoteCommandCallbackArgs;
-using UniqueLock = stdx::unique_lock<stdx::mutex>;
-
-}  // namespace.
 
 /**
  * Clones all databases.
@@ -136,17 +129,17 @@ private:
     void _setStatus_inlock(Status s);
 
     /** Will fail the cloner, call the completion function, and become inactive. */
-    void _fail_inlock(UniqueLock* lk, Status s);
+    void _fail_inlock(stdx::unique_lock<stdx::mutex>* lk, Status s);
 
     /** Will call the completion function, and become inactive. */
-    void _succeed_inlock(UniqueLock* lk);
+    void _succeed_inlock(stdx::unique_lock<stdx::mutex>* lk);
 
     /** Called each time a database clone is finished */
     void _onEachDBCloneFinish(const Status& status, const std::string& name);
 
     //  Callbacks
 
-    void _onListDatabaseFinish(const CommandCallbackArgs& cbd);
+    void _onListDatabaseFinish(const executor::TaskExecutor::RemoteCommandCallbackArgs& cbd);
 
     /**
      * Takes a vector of BSONElements and scans for an element that contains a 'name' field with the