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/mon/Monitor.h | |
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/mon/Monitor.h')
-rw-r--r-- | src/mon/Monitor.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 1fddcd45e37..8299f00c258 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -23,31 +23,26 @@ #ifndef CEPH_MONITOR_H #define CEPH_MONITOR_H -#include "include/types.h" -#include "msg/Messenger.h" - -#include "common/Timer.h" - -#include "MonMap.h" -#include "Elector.h" -#include "Paxos.h" -#include "Session.h" +#include "mon_types.h" -#include "osd/OSDMap.h" +#include <memory> +#include <errno.h> +#include "common/Timer.h" #include "common/LogClient.h" - #include "auth/cephx/CephxKeyServer.h" #include "auth/AuthMethodList.h" #include "auth/KeyRing.h" - +#include "msg/Messenger.h" +#include "osd/OSDMap.h" #include "perfglue/heap_profiler.h" #include "messages/MMonCommand.h" -#include <memory> -#include <errno.h> - +#include "MonMap.h" +#include "Elector.h" +#include "Paxos.h" +#include "Session.h" #define CEPH_MON_PROTOCOL 9 /* cluster internal */ |