diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-07 10:18:38 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-07 10:18:38 -0700 |
| commit | a1ae8b6a7f8019380e423d648d0f6f69023b229f (patch) | |
| tree | ead785ad8b93733b161b39d3838f0fc7619c86a2 | |
| parent | 36658552781673a19d06e800ef621bde850bcf76 (diff) | |
| download | ceph-a1ae8b6a7f8019380e423d648d0f6f69023b229f.tar.gz | |
reinclude assert.h after json_spirit
json_spirit clobbers it!
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/os/hobject.h | 2 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 1 |
2 files changed, 3 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; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index db70429ef7d..0463cd1d64b 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() |