summaryrefslogtreecommitdiff
path: root/src/rgw/rgw_admin.cc
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/rgw/rgw_admin.cc
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/rgw/rgw_admin.cc')
-rw-r--r--src/rgw/rgw_admin.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index ae3baa20dca..4f17f499e01 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1,21 +1,20 @@
#include <errno.h>
-
#include <iostream>
#include <sstream>
#include <string>
-using namespace std;
-
+#include "include/utime.h"
+#include "include/str_list.h"
#include "common/config.h"
#include "common/ceph_argparse.h"
#include "common/Formatter.h"
+#include "common/errno.h"
+#include "common/armor.h"
+#include "auth/Crypto.h"
#include "global/global_init.h"
+#include "global/global_context.h"
#include "global/debug.h"
-#include "common/errno.h"
-#include "include/utime.h"
-#include "include/str_list.h"
-#include "common/armor.h"
#include "rgw_user.h"
#include "rgw_rados.h"
#include "rgw_acl.h"
@@ -23,7 +22,8 @@ using namespace std;
#include "rgw_log.h"
#include "rgw_formats.h"
#include "rgw_usage.h"
-#include "auth/Crypto.h"
+
+using namespace std;
#define dout_subsys ceph_subsys_rgw