reinclude assert.h after json_spirit

json_spirit clobbers it!

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

diff --git a/src/os/hobject.h b/src/os/hobject.h
index a3f36accd00f4f980fd2b0721d4819cf49c74fc0..9a1c207e796396f261d3dcb8946545a617971113 100644 (file)
--- a/src/os/hobject.h
+++ b/src/os/hobject.h
@@ -17,7 +17,9 @@
 
 #include "include/object.h"
 #include "include/cmp.h"
+
 #include "json_spirit/json_spirit_value.h"
+#include "include/assert.h"   // spirit clobbers it!
 
 typedef uint64_t filestore_hobject_key_t;
 

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index db70429ef7d2e1e99763b9141cd8f6803576da25..0463cd1d64bfa85ff761b7b25a48b031b1aa001e 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -43,6 +43,7 @@
 
 #include "json_spirit/json_spirit_value.h"
 #include "json_spirit/json_spirit_reader.h"
+#include "include/assert.h"  // json_spirit clobbers it
 
 #define dout_subsys ceph_subsys_osd
 #define DOUT_PREFIX_ARGS this, osd->whoami, get_osdmap()