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/common/config.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/common/config.h')
| -rw-r--r-- | src/common/config.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/config.h b/src/common/config.h index 86d240f4ce6..e735e030ccf 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -17,6 +17,8 @@ extern struct ceph_file_layout g_default_file_layout; +#include "msg/msg_types.h" + #include <iosfwd> #include <vector> #include <map> @@ -25,9 +27,8 @@ extern struct ceph_file_layout g_default_file_layout; #include "common/ConfUtils.h" #include "common/entity_name.h" #include "common/Mutex.h" -#include "log/SubsystemMap.h" #include "common/config_obs.h" -#include "msg/msg_types.h" +#include "log/SubsystemMap.h" #define OSD_REP_PRIMARY 0 #define OSD_REP_SPLAY 1 |