summaryrefslogtreecommitdiff
path: root/src/msg/Messenger.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/msg/Messenger.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/msg/Messenger.h')
-rw-r--r--src/msg/Messenger.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 6ece6536ad7..096df8c4b65 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -12,30 +12,29 @@
*
*/
-
-
#ifndef CEPH_MESSENGER_H
#define CEPH_MESSENGER_H
+#include "include/types.h"
+
#include <map>
-using namespace std;
+#include <errno.h>
+#include <sstream>
-#include "Message.h"
-#include "Dispatcher.h"
#include "common/Mutex.h"
#include "common/Cond.h"
#include "include/Context.h"
-#include "include/types.h"
#include "include/ceph_features.h"
#include "auth/Crypto.h"
-#include <errno.h>
-#include <sstream>
+#include "Message.h"
+#include "Dispatcher.h"
+
+using namespace std;
class MDS;
class Timer;
-
class Messenger {
private:
list<Dispatcher*> dispatchers;