SERVER-7772 rename and move header to is_master.h

16 files changed, 40 insertions, 36 deletions

diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp
index 9616eca8650..368b1ea8cdc 100644
--- a/src/mongo/db/commands.cpp
+++ b/src/mongo/db/commands.cpp
@@ -30,7 +30,7 @@
 #include "mongo/db/auth/privilege.h"

 #include "mongo/db/client.h"

 #include "mongo/db/jsobj.h"

-#include "mongo/db/replutil.h"

+#include "mongo/db/namespacestring.h"

 #include "mongo/db/server_parameters.h"

 

 namespace mongo {

diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index 489c344f244..622c66c8b5a 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -16,9 +16,9 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pch.h"
+#include "mongo/pch.h"
 
-#include "mr.h"
+#include "mongo/db/commands/mr.h"
 
 #include "mongo/client/connpool.h"
 #include "mongo/client/parallel.h"
@@ -29,7 +29,7 @@
 #include "mongo/db/kill_current_op.h"
 #include "mongo/db/matcher.h"
 #include "mongo/db/query_optimizer.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/scripting/engine.h"
 #include "mongo/s/d_chunk_manager.h"
 #include "mongo/s/d_logic.h"
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index 3d0035d45a9..649603da580 100644
--- a/src/mongo/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
@@ -51,9 +51,9 @@
 #include "mongo/db/ops/count.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/query_optimizer.h"
-#include "mongo/db/repl/write_concern.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/db/repl/oplog.h"
+#include "mongo/db/repl/write_concern.h"
 #include "mongo/db/stats/timer_stats.h"
 #include "mongo/s/d_writeback.h"
 #include "mongo/s/stale_exception.h"  // for SendStaleConfigException
diff --git a/src/mongo/db/dbcommands_generic.cpp b/src/mongo/db/dbcommands_generic.cpp
index 6adcb02a4dd..e3ca59ea499 100644
--- a/src/mongo/db/dbcommands_generic.cpp
+++ b/src/mongo/db/dbcommands_generic.cpp
@@ -37,7 +37,6 @@
 #include "mongo/db/pdfile.h"
 #include "mongo/db/repl/multicmd.h"
 #include "mongo/db/repl/write_concern.h"
-#include "mongo/db/replutil.h"
 #include "mongo/server.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/scripting/engine.h"
diff --git a/src/mongo/db/index_update.cpp b/src/mongo/db/index_update.cpp
index a25b2603b8e..4144fba6102 100644
--- a/src/mongo/db/index_update.cpp
+++ b/src/mongo/db/index_update.cpp
@@ -26,7 +26,7 @@
 #include "mongo/db/kill_current_op.h"
 #include "mongo/db/namespace_details.h"
 #include "mongo/db/pdfile_private.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/db/repl/rs.h"
 #include "mongo/db/sort_phase_one.h"
 #include "mongo/util/processinfo.h"
diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index 78e817ea4d4..ea43a703391 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -52,7 +52,7 @@
 #include "mongo/db/ops/query.h"
 #include "mongo/db/ops/update.h"
 #include "mongo/db/pagefault.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/db/repl/oplog.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/s/d_logic.h"
diff --git a/src/mongo/db/ops/query.cpp b/src/mongo/db/ops/query.cpp
index 0f501ebfe82..e0194fe40cf 100644
--- a/src/mongo/db/ops/query.cpp
+++ b/src/mongo/db/ops/query.cpp
@@ -33,7 +33,6 @@
 #include "mongo/db/repl/finding_start_cursor.h"
 #include "mongo/db/repl/oplog.h"
 #include "mongo/db/repl/repl_reads_ok.h"
-#include "mongo/db/replutil.h"
 #include "mongo/db/scanandorder.h"
 #include "mongo/s/d_logic.h"
 #include "mongo/s/stale_exception.h"  // for SendStaleConfigException
diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
index e858ec7d16a..d0cd226645c 100644
--- a/src/mongo/db/pdfile.cpp
+++ b/src/mongo/db/pdfile.cpp
@@ -52,7 +52,7 @@ _ disallow system* manipulations from the database.
 #include "mongo/db/namespace-inl.h"
 #include "mongo/db/namespacestring.h"
 #include "mongo/db/ops/delete.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/db/sort_phase_one.h"
 #include "mongo/db/repl/oplog.h"
 #include "mongo/util/file.h"
diff --git a/src/mongo/db/replutil.h b/src/mongo/db/repl/is_master.h
index 51dcb2b6909..30889a3edb7 100644
--- a/src/mongo/db/replutil.h
+++ b/src/mongo/db/repl/is_master.h
@@ -16,13 +16,12 @@
 
 #pragma once
 
-#include "db.h"
-#include "dbhelpers.h"
-#include "json.h"
-#include "cmdline.h"
-#include "repl/rs.h"
+#include "mongo/db/client.h"
+#include "mongo/db/database.h"
 #include "mongo/db/repl/master_slave.h"  // replAllDead
 #include "mongo/db/repl/replication_server_status.h"  // replSettings
+#include "mongo/db/repl/rs.h"
+#include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/repl/repl_reads_ok.cpp b/src/mongo/db/repl/repl_reads_ok.cpp
index 786d21d8694..b888b681fa7 100644
--- a/src/mongo/db/repl/repl_reads_ok.cpp
+++ b/src/mongo/db/repl/repl_reads_ok.cpp
@@ -18,9 +18,9 @@
 
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/db/parsed_query.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/db/repl/replication_server_status.h"
 #include "mongo/db/repl/rs.h"
-#include "mongo/db/replutil.h"
 #include "mongo/util/assert_util.h"
 
 namespace mongo {
diff --git a/src/mongo/db/repl/replication_server_status.cpp b/src/mongo/db/repl/replication_server_status.cpp
index 2a1b2296649..84ed231100b 100644
--- a/src/mongo/db/repl/replication_server_status.cpp
+++ b/src/mongo/db/repl/replication_server_status.cpp
@@ -23,9 +23,9 @@
 #include "mongo/client/connpool.h"
 #include "mongo/db/commands/server_status.h"
 #include "mongo/db/jsobj.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/db/repl/master_slave.h"
 #include "mongo/db/repl/rs.h"
-#include "mongo/db/replutil.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/repl/write_concern.cpp b/src/mongo/db/repl/write_concern.cpp
index f05d2939ea2..ddd744d676d 100644
--- a/src/mongo/db/repl/write_concern.cpp
+++ b/src/mongo/db/repl/write_concern.cpp
@@ -20,7 +20,7 @@
 
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/instance.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/util/background.h"
 #include "mongo/util/mongoutils/str.h"
 
diff --git a/src/mongo/db/restapi.cpp b/src/mongo/db/restapi.cpp
index 6c700bbad6d..2822fdafcb4 100644
--- a/src/mongo/db/restapi.cpp
+++ b/src/mongo/db/restapi.cpp
@@ -17,18 +17,21 @@
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "pch.h"
-#include "../util/net/miniwebserver.h"
-#include "../util/mongoutils/html.h"
-#include "../util/md5.hpp"
-#include "instance.h"
-#include "dbwebserver.h"
-#include "dbhelpers.h"
-#include "replutil.h"
-#include "clientcursor.h"
-#include "background.h"
-
-#include "restapi.h"
+#include "mongo/pch.h"
+
+#include "mongo/db/restapi.h"
+
+#include "mongo/db/background.h"
+#include "mongo/db/clientcursor.h"
+#include "mongo/db/dbhelpers.h"
+#include "mongo/db/dbwebserver.h"
+#include "mongo/db/instance.h"
+#include "mongo/db/repl/master_slave.h"
+#include "mongo/db/repl/replication_server_status.h"
+#include "mongo/db/repl/rs.h"
+#include "mongo/util/md5.hpp"
+#include "mongo/util/mongoutils/html.h"
+#include "mongo/util/net/miniwebserver.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/restapi.h b/src/mongo/db/restapi.h
index e5ac52083fe..2f80be04725 100644
--- a/src/mongo/db/restapi.h
+++ b/src/mongo/db/restapi.h
@@ -19,7 +19,10 @@
 
 #pragma once
 
-#include "../util/admin_access.h"
+#include <string>
+
+#include "mongo/db/jsobj.h"
+#include "mongo/util/admin_access.h"
 
 namespace mongo {
 
@@ -28,7 +31,7 @@ namespace mongo {
         virtual ~RestAdminAccess() { }
 
         virtual bool haveAdminUsers() const;
-        virtual BSONObj getAdminUser( const string& username ) const;
+        virtual BSONObj getAdminUser( const std::string& username ) const;
     };
 
 } // namespace mongo
diff --git a/src/mongo/db/ttl.cpp b/src/mongo/db/ttl.cpp
index 584bc20a3bc..c4a90722b02 100644
--- a/src/mongo/db/ttl.cpp
+++ b/src/mongo/db/ttl.cpp
@@ -26,7 +26,7 @@
 #include "mongo/db/databaseholder.h"
 #include "mongo/db/instance.h"
 #include "mongo/db/ops/delete.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/util/background.h"
 
 namespace mongo {
diff --git a/src/mongo/s/d_state.cpp b/src/mongo/s/d_state.cpp
index bca04ff565a..fe0bbad8bb3 100644
--- a/src/mongo/s/d_state.cpp
+++ b/src/mongo/s/d_state.cpp
@@ -22,7 +22,8 @@
    mostly around shard management and checking
  */
 
-#include "pch.h"
+#include "mongo/pch.h"
+
 #include <map>
 #include <string>
 #include <vector>
@@ -33,7 +34,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/db.h"
-#include "mongo/db/replutil.h"
+#include "mongo/db/repl/is_master.h"
 #include "mongo/client/connpool.h"
 #include "mongo/s/chunk_version.h"
 #include "mongo/s/config.h"