]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common: fix build error with Graylog
authorSage Weil <sage@redhat.com>
Thu, 11 Feb 2016 18:24:29 +0000 (13:24 -0500)
committerSage Weil <sage@redhat.com>
Thu, 11 Feb 2016 18:24:29 +0000 (13:24 -0500)
Graylog includes boost stuff, which clobbers our assert macros.

Signed-off-by: Sage Weil <sage@redhat.com>
src/common/Graylog.h

index bac437f1d1cfd7c6cc426f962c235a26afbf8c00..c5fee43f56fad95e0e374ecd6afc616c49376e75 100644 (file)
@@ -12,6 +12,7 @@
 #include <boost/iostreams/filter/zlib.hpp>
 
 #include "include/memory.h"
+#include "include/assert.h"  // boost clobbers this
 
 struct uuid_d;
 class LogEntry;