From: Sage Weil <sage@inktank.com>
Date: Thu, 7 Jun 2012 17:18:38 +0000 (-0700)
Subject: reinclude assert.h after json_spirit
X-Git-Tag: v0.48argonaut~104^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1ae8b6a7f8019380e423d648d0f6f69023b229f;p=ceph.git

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 a3f36accd00f..9a1c207e7963 100644
--- 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 db70429ef7d2..0463cd1d64bf 100644
--- 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()