misc assert #include cleanup, hackery

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 588dcaced479a7553722723f21e0ae9fb5d7a105..6ced00268a0b6fbcc507fd426ecbfdc69e294131 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -24,12 +24,12 @@ using namespace std;
 
 #include "osd/OSD.h"
 #include "os/FileStore.h"
+#include "mon/MonClient.h"
 #include "include/ceph_features.h"
 
 #include "common/config.h"
 
 #include "mon/MonMap.h"
-#include "mon/MonClient.h"
 
 
 #include "msg/Messenger.h"

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index fd48e64c76d3e834dcb2bdb48b61620b9f0c788d..27e239d8ac9674f0e2afbcb3697564f2b3ca992b 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -4,7 +4,13 @@
 #ifndef CEPH_CRUSH_WRAPPER_H
 #define CEPH_CRUSH_WRAPPER_H
 
-#define BUG_ON(x) assert(!(x))
+#include <stdlib.h>
+#include <map>
+#include <set>
+#include <string>
+
+#include <iostream> //for testing, remove
+
 #include "include/types.h"
 
 extern "C" {
@@ -17,12 +23,8 @@ extern "C" {
 #include "include/err.h"
 #include "include/encoding.h"
 
-#include <stdlib.h>
-#include <map>
-#include <set>
-#include <string>
-
-#include <iostream> //for testing, remove
+#include "include/assert.h"
+#define BUG_ON(x) assert(!(x))
 
 namespace ceph {
   class Formatter;

diff --git a/src/include/types.h b/src/include/types.h
index f99c5f7268e19e9d9b4d6204cfb52f7d953c106d..342ebd2f76cc3005ffc0c859d93599e7829c1eba 100644 (file)
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -66,12 +66,13 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
-#include "assert.h"
 #include "object.h"
 #include "intarith.h"
 
 #include "acconfig.h"
 
+#include "assert.h"
+
 // DARWIN compatibility
 #ifdef DARWIN
 typedef long long loff_t;

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 0685f038e978df95a36521a74604791cb889afea..975c252d78943f085cd69ffad1300d4daf9860e0 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -12,10 +12,10 @@ using namespace std;
 #include "include/types.h"
 
 #include "Message.h"
+#include "messages/MPGStats.h"
 
 #include "messages/MGenericMessage.h"
 
-#include "messages/MPGStats.h"
 #include "messages/MPGStatsAck.h"
 
 #include "messages/MStatfs.h"
@@ -24,6 +24,7 @@ using namespace std;
 #include "messages/MGetPoolStats.h"
 #include "messages/MGetPoolStatsReply.h"
 
+
 #include "messages/MPoolOp.h"
 #include "messages/MPoolOpReply.h"
 

diff --git a/src/msg/Message.h b/src/msg/Message.h
index b4071ed2d080fd23cd8ebd9feb8e122740954888..52708bad5b6f4d074119e4db07818cf1e127a95c 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -15,8 +15,17 @@
 #ifndef CEPH_MESSAGE_H
 #define CEPH_MESSAGE_H
  
-/* public message types */
+#include <stdlib.h>
+#include <ostream>
+
 #include "include/types.h"
+#include "include/buffer.h"
+#include "common/Throttle.h"
+#include "msg_types.h"
+
+#include "common/RefCountedObj.h"
+
+#include "common/debug.h"
 #include "common/config.h"
 
 // monitor internal
@@ -128,24 +137,6 @@
 
 
 
-#include <stdlib.h>
-
-#include <iostream>
-#include <list>
-using std::list;
-
-#include <ext/hash_map>
-
-
-#include "include/types.h"
-#include "include/buffer.h"
-#include "common/Throttle.h"
-#include "msg_types.h"
-
-#include "common/RefCountedObj.h"
-
-#include "common/debug.h"
-
 
 
 // ======================================================

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 6be29be9d43ce62e67522dbdab249993a0650623..236430dde3e8027d47f5d2be13f51416f1d65741 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -16,6 +16,19 @@
 #ifndef CEPH_FILESTORE_H
 #define CEPH_FILESTORE_H
 
+#include "include/types.h"
+
+#include <map>
+#include <deque>
+#include <boost/scoped_ptr.hpp>
+#include <fstream>
+using namespace std;
+
+#include <ext/hash_map>
+using namespace __gnu_cxx;
+
+#include "include/assert.h"
+
 #include "ObjectStore.h"
 #include "JournalingObjectStore.h"
 
@@ -30,14 +43,6 @@
 
 #include "include/uuid.h"
 
-#include <map>
-#include <deque>
-#include <boost/scoped_ptr.hpp>
-#include <fstream>
-using namespace std;
-
-#include <ext/hash_map>
-using namespace __gnu_cxx;
 
 // from include/linux/falloc.h:
 #ifndef FALLOC_FL_PUNCH_HOLE

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index ca0b295e40fc3e0b5ce60c1a4035d41d159540e9..9cd79414a81d3d146f21ae16893c972cf3752171 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -17,7 +17,6 @@
 
 #include <sstream>
 #include <stdio.h>
-#include <stdexcept>
 #include <memory>
 
 #include "msg/msg_types.h"