summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-06-06 16:57:31 -0700
committerSage Weil <sage@inktank.com>2012-06-06 16:57:31 -0700
commit0f6d90c7605a05efa9599bfa43ae547096fe1b50 (patch)
treee9f9c51f15c5ba67e14641fe3a9aabb05d844662 /src/include
parenta30601a1b69c3f1ac5cfa592050877aec8b5be9d (diff)
downloadceph-0f6d90c7605a05efa9599bfa43ae547096fe1b50.tar.gz
make everyone use our assert #include and macro
...as detected by the previous patch. Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/encoding.h4
-rw-r--r--src/include/frag.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/include/encoding.h b/src/include/encoding.h
index 2db2a4224fa..97f1b207327 100644
--- a/src/include/encoding.h
+++ b/src/include/encoding.h
@@ -15,14 +15,14 @@
#ifndef CEPH_ENCODING_H
#define CEPH_ENCODING_H
+#include <tr1/memory>
+
#include "inttypes.h"
#include "byteorder.h"
#include "buffer.h"
using namespace ceph;
-#include <tr1/memory>
-
/*
* Notes on feature encoding:
*
diff --git a/src/include/frag.h b/src/include/frag.h
index 7e25712fbb6..a609833db9a 100644
--- a/src/include/frag.h
+++ b/src/include/frag.h
@@ -24,6 +24,7 @@
#include "buffer.h"
#include "ceph_frag.h"
+#include "include/assert.h"
/*
*