From 48ae1fddafc05abaa7530d3de6ee717c187b0180 Mon Sep 17 00:00:00 2001
From: Dwight <dwight@10gen.com>
Date: Thu, 4 Nov 2010 09:07:28 -0400
Subject: [PATCH] move inl header inclusion to top

---
 db/client.h             | 2 +-
 db/curop.h              | 2 +-
 db/dbcommands_admin.cpp | 2 +-
 db/dbmessage.h          | 2 +-
 db/driverHelpers.cpp    | 2 +-
 db/extsort.cpp          | 2 +-
 db/extsort.h            | 2 +-
 db/geo/2d.cpp           | 2 +-
 db/geo/haystack.cpp     | 2 +-
 db/index.cpp            | 2 +-
 db/indexkey.cpp         | 2 +-
 db/namespace-inl.h      | 2 ++
 db/namespace.h          | 2 --
 db/pdfile.cpp           | 2 +-
 db/pdfile.h             | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/db/client.h b/db/client.h
index 493996cfa0c..becd3b70d6e 100644
--- a/db/client.h
+++ b/db/client.h
@@ -26,7 +26,7 @@
 
 #include "../pch.h"
 #include "security.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "lasterror.h"
 #include "stats/top.h"
 
diff --git a/db/curop.h b/db/curop.h
index fa96543ec48..9fe5fb5d392 100644
--- a/db/curop.h
+++ b/db/curop.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "client.h"
 #include "../bson/util/atomic_int.h"
 #include "../util/concurrency/spin_lock.h"
diff --git a/db/dbcommands_admin.cpp b/db/dbcommands_admin.cpp
index c2f5b34f1f5..14cac9998de 100644
--- a/db/dbcommands_admin.cpp
+++ b/db/dbcommands_admin.cpp
@@ -25,7 +25,7 @@
 #include "pch.h"
 #include "jsobj.h"
 #include "pdfile.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "commands.h"
 #include "cmdline.h"
 #include "btree.h"
diff --git a/db/dbmessage.h b/db/dbmessage.h
index 2849de8664c..53d6c478234 100644
--- a/db/dbmessage.h
+++ b/db/dbmessage.h
@@ -18,7 +18,7 @@
 
 #include "diskloc.h"
 #include "jsobj.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "../util/message.h"
 #include "../client/constants.h"
 
diff --git a/db/driverHelpers.cpp b/db/driverHelpers.cpp
index 7b8a3d06c40..ce89ca475af 100644
--- a/db/driverHelpers.cpp
+++ b/db/driverHelpers.cpp
@@ -24,7 +24,7 @@
 #include "pch.h"
 #include "jsobj.h"
 #include "pdfile.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "commands.h"
 #include "cmdline.h"
 #include "btree.h"
diff --git a/db/extsort.cpp b/db/extsort.cpp
index a4a95708047..14a599f3731 100644
--- a/db/extsort.cpp
+++ b/db/extsort.cpp
@@ -19,7 +19,7 @@
 #include "pch.h"
 
 #include "extsort.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "../util/file.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/db/extsort.h b/db/extsort.h
index 802c9033c84..7595c81ad60 100644
--- a/db/extsort.h
+++ b/db/extsort.h
@@ -20,7 +20,7 @@
 
 #include "../pch.h"
 #include "jsobj.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "curop-inl.h"
 #include "../util/array.h"
 
diff --git a/db/geo/2d.cpp b/db/geo/2d.cpp
index 7b11081855f..9eff4fbe684 100644
--- a/db/geo/2d.cpp
+++ b/db/geo/2d.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "pch.h"
-#include "../namespace.h"
+#include "../namespace-inl.h"
 #include "../jsobj.h"
 #include "../index.h"
 #include "../../util/unittest.h"
diff --git a/db/geo/haystack.cpp b/db/geo/haystack.cpp
index c7cd1b23e39..092258fcb3b 100644
--- a/db/geo/haystack.cpp
+++ b/db/geo/haystack.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "pch.h"
-#include "../namespace.h"
+#include "../namespace-inl.h"
 #include "../jsobj.h"
 #include "../index.h"
 #include "../../util/unittest.h"
diff --git a/db/index.cpp b/db/index.cpp
index 62570b0a13a..f2aad60de2e 100644
--- a/db/index.cpp
+++ b/db/index.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "pch.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "index.h"
 #include "btree.h"
 #include "query.h"
diff --git a/db/indexkey.cpp b/db/indexkey.cpp
index 926a6c338e0..5405c6537f9 100644
--- a/db/indexkey.cpp
+++ b/db/indexkey.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "pch.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "index.h"
 #include "btree.h"
 #include "query.h"
diff --git a/db/namespace-inl.h b/db/namespace-inl.h
index 2f59bc3ec39..12c4fbe1059 100644
--- a/db/namespace-inl.h
+++ b/db/namespace-inl.h
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "namespace.h"
+
 namespace mongo { 
 
     inline Namespace& Namespace::operator=(const char *ns) {
diff --git a/db/namespace.h b/db/namespace.h
index 1c9be22e62e..0c8e086bccd 100644
--- a/db/namespace.h
+++ b/db/namespace.h
@@ -583,5 +583,3 @@ namespace mongo {
     }
 
 } // namespace mongo
-
-#include "namespace-inl.h"
diff --git a/db/pdfile.cpp b/db/pdfile.cpp
index 779532711f8..d6c939655c7 100644
--- a/db/pdfile.cpp
+++ b/db/pdfile.cpp
@@ -36,7 +36,7 @@ _ disallow system* manipulations from the database.
 #include "query.h"
 #include "repl.h"
 #include "dbhelpers.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "queryutil.h"
 #include "extsort.h"
 #include "curop-inl.h"
diff --git a/db/pdfile.h b/db/pdfile.h
index 6128e1ebd1b..e636413180c 100644
--- a/db/pdfile.h
+++ b/db/pdfile.h
@@ -29,7 +29,7 @@
 #include "../util/mmap.h"
 #include "diskloc.h"
 #include "jsobjmanipulator.h"
-#include "namespace.h"
+#include "namespace-inl.h"
 #include "client.h"
 
 namespace mongo {