summaryrefslogtreecommitdiff
path: root/src/cls/rbd/cls_rbd_client.h
diff options
context:
space:
mode:
authorRoald J. van Loon <roaldvanloon@gmail.com>2012-12-24 13:10:57 +0100
committerRoald van Loon <roaldvanloon@gmail.com>2012-12-24 22:26:56 +0000
commit17ae36a5420eb4568f93ba3d9f185dfbc0a42918 (patch)
treeae06815a5638dea51b98466d81b6b0c5a46f987d /src/cls/rbd/cls_rbd_client.h
parent18001d059656224abbf7d92c1c54befd33ec8d6e (diff)
downloadceph-wip-dout.tar.gz
cleanup: changed order of #includes, global_context.h, debug.hwip-dout
- lots of rewriting of #include ordering (see below) - renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h - included global/global_context.h and global/debug.h where used - fixed lots of duplicate includes The order of #includes is now; 1. types include (include/types.h, mds/mds_types.h, etc) 2. system includes (like stl, boost, etc) 3. ceph includes (include/..) 4. ceph common (common/..) 5. ceph other (auth/.., os/.., global/.., etc) 6. list of messages/.., if used 7. local includes (headers from same module) 8. own header (<basename>.h) "using namespace" stuff is always directly below #include, not intermixed with them (WIP notice: most files have this implemented, but some not yet) Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
Diffstat (limited to 'src/cls/rbd/cls_rbd_client.h')
-rw-r--r--src/cls/rbd/cls_rbd_client.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h
index c1d421a43a8..f32d9d90b83 100644
--- a/src/cls/rbd/cls_rbd_client.h
+++ b/src/cls/rbd/cls_rbd_client.h
@@ -4,15 +4,16 @@
#ifndef CEPH_LIBRBD_CLS_RBD_CLIENT_H
#define CEPH_LIBRBD_CLS_RBD_CLIENT_H
-#include "cls/lock/cls_lock_types.h"
-#include "common/snap_types.h"
+#include <string>
+#include <vector>
+
#include "include/rados.h"
#include "include/rados/librados.hpp"
#include "include/types.h"
#include "librbd/parent_types.h"
+#include "common/snap_types.h"
-#include <string>
-#include <vector>
+#include "../lock/cls_lock_types.h"
namespace librbd {
namespace cls_client {