summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-06-07 10:18:38 -0700
committerSage Weil <sage@inktank.com>2012-06-07 10:18:38 -0700
commita1ae8b6a7f8019380e423d648d0f6f69023b229f (patch)
treeead785ad8b93733b161b39d3838f0fc7619c86a2 /src/os
parent36658552781673a19d06e800ef621bde850bcf76 (diff)
downloadceph-a1ae8b6a7f8019380e423d648d0f6f69023b229f.tar.gz
reinclude assert.h after json_spirit
json_spirit clobbers it! Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/os')
-rw-r--r--src/os/hobject.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/hobject.h b/src/os/hobject.h
index a3f36accd00..9a1c207e796 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;