diff options
author | Roald J. van Loon <roaldvanloon@gmail.com> | 2012-12-24 13:10:57 +0100 |
---|---|---|
committer | Roald van Loon <roaldvanloon@gmail.com> | 2012-12-24 22:26:56 +0000 |
commit | 17ae36a5420eb4568f93ba3d9f185dfbc0a42918 (patch) | |
tree | ae06815a5638dea51b98466d81b6b0c5a46f987d /src/ceph_mon.cc | |
parent | 18001d059656224abbf7d92c1c54befd33ec8d6e (diff) | |
download | ceph-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/ceph_mon.cc')
-rw-r--r-- | src/ceph_mon.cc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 3a8429f94c3..aa704066192 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -15,33 +15,28 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> - #include <iostream> #include <string> -using namespace std; -#include "common/config.h" +#include "include/CompatSet.h" +#include "include/assert.h" #include "include/ceph_features.h" - +#include "common/config.h" +#include "common/ceph_argparse.h" +#include "common/pick_address.h" +#include "common/Timer.h" +#include "common/errno.h" #include "mon/MonMap.h" #include "mon/Monitor.h" #include "mon/MonitorStore.h" #include "mon/MonClient.h" - #include "msg/Messenger.h" - -#include "include/CompatSet.h" - -#include "common/ceph_argparse.h" -#include "common/pick_address.h" -#include "common/Timer.h" -#include "common/errno.h" - #include "global/global_init.h" +#include "global/global_context.h" #include "global/signal_handler.h" #include "global/debug.h" -#include "include/assert.h" +using namespace std; #define dout_subsys ceph_subsys_mon |