summaryrefslogtreecommitdiff
path: root/src/common/OutputDataSocket.cc
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/common/OutputDataSocket.cc
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/common/OutputDataSocket.cc')
-rw-r--r--src/common/OutputDataSocket.cc26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc
index 353596fe830..3832d23d784 100644
--- a/src/common/OutputDataSocket.cc
+++ b/src/common/OutputDataSocket.cc
@@ -11,34 +11,30 @@
* Foundation. See file COPYING.
*
*/
-
-#include "common/Thread.h"
-#include "common/OutputDataSocket.h"
-#include "common/config.h"
-#include "common/debug.h"
-#include "common/errno.h"
-#include "common/perf_counters.h"
-#include "common/pipe.h"
-#include "common/safe_io.h"
-#include "common/version.h"
-#include "common/Formatter.h"
-
+#include <inttypes.h>
#include <errno.h>
#include <fcntl.h>
-#include <inttypes.h>
-#include <map>
#include <poll.h>
#include <set>
#include <sstream>
#include <stdint.h>
#include <string.h>
-#include <string>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include <unistd.h>
#include "include/compat.h"
+#include "common/config.h"
+#include "common/debug.h"
+#include "common/errno.h"
+#include "common/perf_counters.h"
+#include "common/pipe.h"
+#include "common/safe_io.h"
+#include "common/version.h"
+#include "common/Formatter.h"
+
+#include "OutputDataSocket.h"
#define dout_subsys ceph_subsys_asok
#undef dout_prefix