]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
reinclude assert.h after json_spirit
authorSage Weil <sage@inktank.com>
Thu, 7 Jun 2012 17:18:38 +0000 (10:18 -0700)
committerSage Weil <sage@inktank.com>
Thu, 7 Jun 2012 17:18:38 +0000 (10:18 -0700)
json_spirit clobbers it!

Signed-off-by: Sage Weil <sage@inktank.com>
src/os/hobject.h
src/osd/ReplicatedPG.cc

index a3f36accd00f4f980fd2b0721d4819cf49c74fc0..9a1c207e796396f261d3dcb8946545a617971113 100644 (file)
@@ -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;
 
index db70429ef7d2e1e99763b9141cd8f6803576da25..0463cd1d64bfa85ff761b7b25a48b031b1aa001e 100644 (file)
@@ -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()