SERVER-25713 Remove unnamed namespace and fix up references to it.

2 files changed, 3 insertions, 13 deletions

diff --git a/src/mongo/db/repl/data_replicator.h b/src/mongo/db/repl/data_replicator.h
index 7a7cd96512f..62a8f134988 100644
--- a/src/mongo/db/repl/data_replicator.h
+++ b/src/mongo/db/repl/data_replicator.h
@@ -55,17 +55,6 @@
 namespace mongo {
 namespace repl {
 
-namespace {
-
-using CallbackArgs = executor::TaskExecutor::CallbackArgs;
-using Event = executor::TaskExecutor::EventHandle;
-using Handle = executor::TaskExecutor::CallbackHandle;
-using Operations = MultiApplier::Operations;
-using QueryResponseStatus = StatusWith<Fetcher::QueryResponse>;
-using UniqueLock = stdx::unique_lock<stdx::mutex>;
-
-}  // namespace
-
 // TODO: Remove forward declares once we remove rs_initialsync.cpp and other dependents.
 // Failpoint which fails initial sync and leaves an oplog entry in the buffer.
 MONGO_FP_FORWARD_DECLARE(failInitSyncWithBufferedEntriesLeft);
@@ -478,7 +467,7 @@ private:
 
     BSONObj _getInitialSyncProgress_inlock() const;
 
-    StatusWith<Operations> _getNextApplierBatch_inlock();
+    StatusWith<MultiApplier::Operations> _getNextApplierBatch_inlock();
 
     /**
      * Schedules a fetcher to get the last oplog entry from the sync source.
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index 1cc1c949227..38c403853ce 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -93,6 +93,7 @@ namespace repl {
 
 MONGO_FP_DECLARE(transitionToPrimaryHangBeforeTakingGlobalExclusiveLock);
 
+using CallbackArgs = executor::TaskExecutor::CallbackArgs;
 using CallbackFn = executor::TaskExecutor::CallbackFn;
 using CallbackHandle = executor::TaskExecutor::CallbackHandle;
 using CBHandle = ReplicationExecutor::CallbackHandle;
@@ -1962,7 +1963,7 @@ Status ReplicationCoordinatorImpl::resyncData(OperationContext* txn, bool waitUn
     if (waitUntilCompleted)
         f = [&finishedEvent, this]() { _replExecutor.signalEvent(finishedEvent); };
 
-    UniqueLock lk(_mutex);
+    stdx::unique_lock<stdx::mutex> lk(_mutex);
     _resetMyLastOpTimes_inlock();
     lk.unlock();  // unlock before calling into replCoordExtState.
     _startDataReplication(txn, f);