summaryrefslogtreecommitdiff
path: root/src/osd/OSD.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/osd/OSD.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/osd/OSD.h')
-rw-r--r--src/osd/OSD.h43
1 files changed, 19 insertions, 24 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 211a4c1fe7c..4da249f628b 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -15,45 +15,40 @@
#ifndef CEPH_OSD_H
#define CEPH_OSD_H
-#include "boost/tuple/tuple.hpp"
-
-#include "PG.h"
-
-#include "msg/Dispatcher.h"
+#include <boost/tuple/tuple.hpp>
+#include <map>
+#include <memory>
+#include <tr1/memory>
+#include <ext/hash_map>
+#include <ext/hash_set>
+#include "include/CompatSet.h"
#include "common/Mutex.h"
#include "common/RWLock.h"
#include "common/Timer.h"
#include "common/WorkQueue.h"
#include "common/LogClient.h"
#include "common/AsyncReserver.h"
-
-#include "os/ObjectStore.h"
-#include "OSDCap.h"
-
+#include "common/shared_cache.hpp"
+#include "common/simple_cache.hpp"
+#include "common/sharedptr_registry.hpp"
+#include "common/PrioritizedQueue.h"
#include "common/DecayCounter.h"
-#include "osd/ClassHandler.h"
-
-#include "include/CompatSet.h"
-
#include "auth/KeyRing.h"
+#include "msg/Dispatcher.h"
+#include "os/ObjectStore.h"
+#include "global/global_context.h"
+
#include "messages/MOSDRepScrub.h"
+
+#include "OSDCap.h"
+#include "ClassHandler.h"
#include "OpRequest.h"
+#include "PG.h"
-#include <map>
-#include <memory>
-#include <tr1/memory>
using namespace std;
-
-#include <ext/hash_map>
-#include <ext/hash_set>
using namespace __gnu_cxx;
-#include "common/shared_cache.hpp"
-#include "common/simple_cache.hpp"
-#include "common/sharedptr_registry.hpp"
-#include "common/PrioritizedQueue.h"
-
#define CEPH_OSD_PROTOCOL 10 /* cluster internal */