osd: rearrange #includes to get our assert

Make sure we include boostchart headers before our common/assert.h so that
ours clobbers theirs.  Otherwise the generic one will clobber ours and our
assert output won't get logged or be as pretty.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4006b2a531d68468c736ca3cda7f16d53915ce86..a58795c6799a201c255fd504541fa14b9727ed7b 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -13,6 +13,7 @@
  */
 
 
+#include "osd/PG.h"
 
 #include "include/types.h"
 

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index e52f5c5e39c82e9fd03e2f89e68977757f151a64..b1d25736bb0d9a22a98d30c0b392032c8d3f8261 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -15,6 +15,8 @@
 #ifndef CEPH_OSD_H
 #define CEPH_OSD_H
 
+#include "PG.h"
+
 #include "msg/Dispatcher.h"
 
 #include "common/Mutex.h"
@@ -24,7 +26,6 @@
 #include "common/LogClient.h"
 
 #include "os/ObjectStore.h"
-#include "PG.h"
 #include "OSDCaps.h"
 
 #include "common/DecayCounter.h"

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 9f9ac9f363e0ff2c64bb7b5a703be09e5934a149..d614f4ab57483e953e5158a571fcab6f91ae285f 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -15,6 +15,12 @@
 #ifndef CEPH_PG_H
 #define CEPH_PG_H
 
+#include <boost/statechart/custom_reaction.hpp>
+#include <boost/statechart/event.hpp>
+#include <boost/statechart/simple_state.hpp>
+#include <boost/statechart/state.hpp>
+#include <boost/statechart/state_machine.hpp>
+#include <boost/statechart/transition.hpp>
 
 #include "include/types.h"
 #include "osd_types.h"
@@ -27,13 +33,6 @@
 #include "msg/Messenger.h"
 #include "messages/MOSDRepScrub.h"
 
-#include <boost/statechart/custom_reaction.hpp>
-#include <boost/statechart/event.hpp>
-#include <boost/statechart/simple_state.hpp>
-#include <boost/statechart/state.hpp>
-#include <boost/statechart/state_machine.hpp>
-#include <boost/statechart/transition.hpp>
-
 #include "common/DecayCounter.h"
 
 #include <list>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 6c8b58e795fb47d5f381b9117fa93cbe466d3fb4..052a1736d75c1ba773b15912f7f9287592a27649 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11,6 +11,7 @@
  * 
  */
 
+#include "PG.h"
 #include "ReplicatedPG.h"
 #include "OSD.h"
 #include "PGLS.h"

diff --git a/src/osd/Watch.cc b/src/osd/Watch.cc
index f993276a99b664bea10a739a1f4ca1db8cf122a9..6a01f30e6d207539279d064e1645fe4223764982 100644 (file)
--- a/src/osd/Watch.cc
+++ b/src/osd/Watch.cc
@@ -1,3 +1,6 @@
+
+#include "PG.h"
+
 #include "include/types.h"
 
 #include <map>