From ebdae19fd226104baec712b9da9939ff82ef3c3a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 21 Sep 2016 00:21:23 +0900
Subject: Remove empty newlines in #include blocks.
This makes clang-format useful on those.
Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
---
src/common/logging/backend.cpp | 3 +--
src/common/logging/backend.h | 1 -
src/common/logging/filter.cpp | 3 +--
src/common/logging/filter.h | 1 -
src/common/logging/text_formatter.cpp | 5 ++---
5 files changed, 4 insertions(+), 9 deletions(-)
(limited to 'src/common/logging')
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index b3d6598e44..b4a3129480 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -2,13 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include "common/logging/backend.h"
#include <algorithm>
#include <array>
#include <cstdio>
-
#include "common/assert.h"
#include "common/common_funcs.h" // snprintf compatibility define
-#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h
index 3fe88e4f65..c4fe2acbf2 100644
--- a/src/common/logging/backend.h
+++ b/src/common/logging/backend.h
@@ -8,7 +8,6 @@
#include <cstdarg>
#include <string>
#include <utility>
-
#include "common/logging/log.h"
namespace Log {
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index 186e0b6219..9aa72cecce 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -2,10 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include "common/logging/filter.h"
#include <algorithm>
-
#include "common/logging/backend.h"
-#include "common/logging/filter.h"
#include "common/string_util.h"
namespace Log {
diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h
index db526fead4..b51df61de9 100644
--- a/src/common/logging/filter.h
+++ b/src/common/logging/filter.h
@@ -7,7 +7,6 @@
#include <array>
#include <cstddef>
#include <string>
-
#include "common/logging/log.h"
namespace Log {
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index 955358553d..d61c1696ba 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -10,12 +10,11 @@
#include <Windows.h>
#endif
+#include "common/assert.h"
+#include "common/common_funcs.h"
#include "common/logging/backend.h"
#include "common/logging/log.h"
#include "common/logging/text_formatter.h"
-
-#include "common/assert.h"
-#include "common/common_funcs.h"
#include "common/string_util.h"
namespace Log {
--
cgit v1.2.3-70-g09d2