Clang format sort includes

include/spdlog/async.h

@@ -14,14 +14,14 @@
 // This is because each message in the queue holds a shared_ptr to the
 // originating logger.
 
-#include "async_logger.h"
-#include "details/registry.h"
-#include "details/thread_pool.h"
-
 #include <functional>
 #include <memory>
 #include <mutex>
 
+#include "async_logger.h"
+#include "details/registry.h"
+#include "details/thread_pool.h"
+
 namespace spdlog {
 
 namespace details {

include/spdlog/cfg/argv.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 #pragma once
-#include "helpers.h"
 #include "../details/registry.h"
+#include "helpers.h"
 
 //
 // Init log levels using each argv entry that starts with "SPDLOG_LEVEL="

include/spdlog/cfg/env.h

@@ -2,9 +2,9 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 #pragma once
-#include "helpers.h"
 #include "../details/os.h"
 #include "../details/registry.h"
+#include "helpers.h"
 
 //
 // Init levels and patterns from env variables SPDLOG_LEVEL

include/spdlog/cfg/helpers.h

@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include "../common.h"
 #include <unordered_map>
 
+#include "../common.h"
+
 namespace spdlog {
 namespace cfg {
 namespace helpers {

include/spdlog/common.h

@@ -2,9 +2,6 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 #pragma once
-#include "details/null_mutex.h"
-#include "tweakme.h"
-
 #include <array>
 #include <atomic>
 #include <chrono>
@@ -17,6 +14,9 @@
 #include <string>
 #include <type_traits>
 
+#include "details/null_mutex.h"
+#include "tweakme.h"
+
 #if __has_include(<version>)
     #include <version>
 #endif

include/spdlog/details/console_globals.h

@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include "null_mutex.h"
 #include <mutex>
 
+#include "null_mutex.h"
+
 namespace spdlog {
 namespace details {
 

include/spdlog/details/file_helper.h

@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include "../common.h"
 #include <tuple>
 
+#include "../common.h"
+
 namespace spdlog {
 namespace details {
 

include/spdlog/details/fmt_helper.h

@@ -2,13 +2,13 @@
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 #pragma once
 
-#include "../common.h"
-#include "../fmt/fmt.h"
-
 #include <chrono>
 #include <iterator>
 #include <type_traits>
 
+#include "../common.h"
+#include "../fmt/fmt.h"
+
 #ifdef SPDLOG_USE_STD_FORMAT
     #include <charconv>
     #include <limits>

include/spdlog/details/log_msg.h

@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include "../common.h"
 #include <string>
 
+#include "../common.h"
+
 namespace spdlog {
 namespace details {
 struct SPDLOG_API log_msg {

include/spdlog/details/mpmc_blocking_q.h

@@ -10,12 +10,12 @@
 // dequeue_for(..) - will block until the queue is not empty or timeout have
 // passed.
 
-#include "circular_q.h"
-
 #include <atomic>
 #include <condition_variable>
 #include <mutex>
 
+#include "circular_q.h"
+
 namespace spdlog {
 namespace details {
 

include/spdlog/details/os.h

@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include "../common.h"
 #include <ctime>  // std::time_t
 
+#include "../common.h"
+
 namespace spdlog {
 namespace details {
 namespace os {

include/spdlog/details/periodic_worker.h

@@ -10,14 +10,14 @@
 //    stops and joins the thread on destruction (if the thread is executing a callback, wait for it
 //    to finish first).
 
-#include "../common.h"
-
 #include <chrono>
 #include <condition_variable>
 #include <functional>
 #include <mutex>
 #include <thread>
 
+#include "../common.h"
+
 namespace spdlog {
 namespace details {
 

include/spdlog/details/registry.h

@@ -8,9 +8,6 @@
 // If user requests a non existing logger, nullptr will be returned
 // This class is thread safe
 
-#include "../common.h"
-#include "periodic_worker.h"
-
 #include <chrono>
 #include <functional>
 #include <memory>
@@ -18,6 +15,9 @@
 #include <string>
 #include <unordered_map>
 
+#include "../common.h"
+#include "periodic_worker.h"
+
 namespace spdlog {
 class logger;
 

include/spdlog/details/tcp_client-windows.h

@@ -5,16 +5,17 @@
 
 #define WIN32_LEAN_AND_MEAN
 // tcp client helper
-#include "../common.h"
-#include "os.h"
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <string>
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <string>
+
+#include "../common.h"
+#include "os.h"
+
 #pragma comment(lib, "Ws2_32.lib")
 #pragma comment(lib, "Mswsock.lib")
 #pragma comment(lib, "AdvApi32.lib")

include/spdlog/details/tcp_client.h

@@ -8,9 +8,6 @@
 #endif
 
 // tcp client helper
-#include "../common.h"
-#include "os.h"
-
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -20,6 +17,9 @@
 
 #include <string>
 
+#include "../common.h"
+#include "os.h"
+
 namespace spdlog {
 namespace details {
 class tcp_client {

include/spdlog/details/thread_pool.h

@@ -3,17 +3,17 @@
 
 #pragma once
 
-#include "../async.h"
-#include "log_msg_buffer.h"
-#include "mpmc_blocking_q.h"
-#include "os.h"
-
 #include <chrono>
 #include <functional>
 #include <memory>
 #include <thread>
 #include <vector>
 
+#include "../async.h"
+#include "log_msg_buffer.h"
+#include "mpmc_blocking_q.h"
+#include "os.h"
+
 namespace spdlog {
 class async_logger;
 

include/spdlog/details/udp_client-windows.h

@@ -6,16 +6,17 @@
 // Helper RAII over winsock udp client socket.
 // Will throw on construction if socket creation failed.
 
-#include "os.h"
-#include "windows_include.h"
-#include "../common.h"
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <string>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <string>
+
+#include "../common.h"
+#include "os.h"
+#include "windows_include.h"
+
 #if defined(_MSC_VER)
     #pragma comment(lib, "Ws2_32.lib")
     #pragma comment(lib, "Mswsock.lib")

include/spdlog/details/udp_client.h

@@ -9,18 +9,18 @@
 #include "../common.h"
 #include "os.h"
 
-
 #ifdef _WIN32
     #error "include udp_client-windows.h instead"
 #endif
 
 #include <arpa/inet.h>
-#include <cstring>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
 #include <sys/socket.h>
 #include <unistd.h>
+
+#include <cstring>
 #include <string>
 
 namespace spdlog {

include/spdlog/fmt/bin_to_hex.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include <cctype>
+
 #include "../common.h"
 
 #if defined(__has_include)

include/spdlog/fmt/compile.h

@@ -10,7 +10,7 @@
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
     #if !defined(SPDLOG_FMT_EXTERNAL)
-            #include "../fmt/bundled/compile.h"
+        #include "../fmt/bundled/compile.h"
     #else
         #include <fmt/compile.h>
     #endif

include/spdlog/fmt/ostr.h

@@ -10,7 +10,7 @@
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
     #if !defined(SPDLOG_FMT_EXTERNAL)
-            #include "../fmt/bundled/ostream.h"
+        #include "../fmt/bundled/ostream.h"
     #else
         #include <fmt/ostream.h>
     #endif

include/spdlog/logger.h

@@ -14,13 +14,13 @@
 // The use of private formatter per sink provides the opportunity to cache some
 // formatted data, and support for different format per sink.
 
+#include <cassert>
+#include <vector>
+
 #include "common.h"
 #include "details/log_msg.h"
 #include "sinks/sink.h"
 
-#include <cassert>
-#include <vector>
-
 #ifndef SPDLOG_NO_EXCEPTIONS
     #define SPDLOG_LOGGER_CATCH(location)                                                         \
         catch (const std::exception &ex) {                                                        \

include/spdlog/pattern_formatter.h

@@ -3,19 +3,18 @@
 
 #pragma once
 
+#include <chrono>
+#include <ctime>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "common.h"
 #include "details/log_msg.h"
 #include "details/os.h"
 #include "formatter.h"
 
-#include <chrono>
-#include <ctime>
-#include <memory>
-
-#include <string>
-#include <unordered_map>
-#include <vector>
-
 namespace spdlog {
 namespace details {
 

include/spdlog/sinks/android_sink.h

@@ -5,19 +5,20 @@
 
 #ifdef __ANDROID__
 
-    #include "../details/fmt_helper.h"
-    #include "../details/null_mutex.h"
-    #include "os.h"
-    #include "../details/synchronous_factory.h"
-    #include "base_sink.h"
-
     #include <android/log.h>
+
     #include <chrono>
     #include <mutex>
     #include <string>
     #include <thread>
     #include <type_traits>
 
+    #include "../details/fmt_helper.h"
+    #include "../details/null_mutex.h"
+    #include "../details/synchronous_factory.h"
+    #include "base_sink.h"
+    #include "os.h"
+
     #if !defined(SPDLOG_ANDROID_RETRIES)
         #define SPDLOG_ANDROID_RETRIES 2
     #endif

include/spdlog/sinks/ansicolor_sink.h

@@ -6,10 +6,11 @@
 #include <array>
 #include <memory>
 #include <mutex>
+#include <string>
+
 #include "../details/console_globals.h"
 #include "../details/null_mutex.h"
 #include "sink.h"
-#include <string>
 
 namespace spdlog {
 namespace sinks {

include/spdlog/sinks/basic_file_sink.h

@@ -3,14 +3,14 @@
 
 #pragma once
 
+#include <mutex>
+#include <string>
+
 #include "../details/file_helper.h"
 #include "../details/null_mutex.h"
 #include "../details/synchronous_factory.h"
 #include "base_sink.h"
 
-#include <mutex>
-#include <string>
-
 namespace spdlog {
 namespace sinks {
 /*

include/spdlog/sinks/callback_sink.h

@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include <mutex>
+#include <string>
+
 #include "../details/null_mutex.h"
 #include "../details/synchronous_factory.h"
 #include "base_sink.h"
 
-#include <mutex>
-#include <string>
-
 namespace spdlog {
 
 // callbacks type

include/spdlog/sinks/daily_file_sink.h

@@ -3,6 +3,13 @@
 
 #pragma once
 
+#include <chrono>
+#include <cstdio>
+#include <iomanip>
+#include <mutex>
+#include <sstream>
+#include <string>
+
 #include "../common.h"
 #include "../details/circular_q.h"
 #include "../details/file_helper.h"
@@ -13,13 +20,6 @@
 #include "../fmt/fmt.h"
 #include "base_sink.h"
 
-#include <chrono>
-#include <cstdio>
-#include <iomanip>
-#include <mutex>
-#include <sstream>
-#include <string>
-
 namespace spdlog {
 namespace sinks {
 

include/spdlog/sinks/dist_sink.h

@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include "base_sink.h"
-#include "../details/log_msg.h"
-#include "../details/null_mutex.h"
-#include "../pattern_formatter.h"
-
 #include <algorithm>
 #include <memory>
 #include <mutex>
 #include <vector>
 
+#include "../details/log_msg.h"
+#include "../details/null_mutex.h"
+#include "../pattern_formatter.h"
+#include "base_sink.h"
+
 // Distribution sink (mux). Stores a vector of sinks which get called when log
 // is called
 

include/spdlog/sinks/dup_filter_sink.h

@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include "dist_sink.h"
-#include "../details/log_msg.h"
-#include "../details/null_mutex.h"
-
 #include <chrono>
 #include <cstdio>
 #include <mutex>
 #include <string>
 
+#include "../details/log_msg.h"
+#include "../details/null_mutex.h"
+#include "dist_sink.h"
+
 // Duplicate message removal sink.
 // Skip the message if previous one is identical and less than "max_skip_duration" have passed
 //

include/spdlog/sinks/hourly_file_sink.h

@@ -3,6 +3,12 @@
 
 #pragma once
 
+#include <chrono>
+#include <cstdio>
+#include <ctime>
+#include <mutex>
+#include <string>
+
 #include "../common.h"
 #include "../details/circular_q.h"
 #include "../details/file_helper.h"
@@ -12,12 +18,6 @@
 #include "../fmt/fmt.h"
 #include "base_sink.h"
 
-#include <chrono>
-#include <cstdio>
-#include <ctime>
-#include <mutex>
-#include <string>
-
 namespace spdlog {
 namespace sinks {
 

include/spdlog/sinks/kafka_sink.h

@@ -10,14 +10,14 @@
 // https://github.com/confluentinc/librdkafka
 //
 
-#include "base_sink.h"
+#include <mutex>
+
 #include "../async.h"
+#include "../common.h"
 #include "../details/log_msg.h"
 #include "../details/null_mutex.h"
 #include "../details/synchronous_factory.h"
-
-#include <mutex>
-#include "../common.h"
+#include "base_sink.h"
 
 // kafka header
 #include <librdkafka/rdkafkacpp.h>

include/spdlog/sinks/mongo_sink.h

@@ -10,19 +10,18 @@
 // http://mongocxx.org/mongocxx-v3/installation/
 //
 
-#include "base_sink.h"
-#include "../common.h"
-#include "../details/log_msg.h"
-#include "../details/synchronous_factory.h"
-
 #include <bsoncxx/builder/stream/document.hpp>
 #include <bsoncxx/types.hpp>
 #include <bsoncxx/view_or_value.hpp>
-
 #include <mongocxx/client.hpp>
 #include <mongocxx/instance.hpp>
 #include <mongocxx/uri.hpp>
 
+#include "../common.h"
+#include "../details/log_msg.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
+
 namespace spdlog {
 namespace sinks {
 template <typename Mutex>
@@ -78,8 +77,9 @@ private:
     std::unique_ptr<mongocxx::client> client_ = nullptr;
 };
 
-#include "../details/null_mutex.h"
 #include <mutex>
+
+#include "../details/null_mutex.h"
 using mongo_sink_mt = mongo_sink<std::mutex>;
 using mongo_sink_st = mongo_sink<spdlog::details::null_mutex>;
 

include/spdlog/sinks/msvc_sink.h

@@ -4,12 +4,12 @@
 #pragma once
 
 #if defined(_WIN32)
-    #include "../details/null_mutex.h"
-    #include "base_sink.h"
-
     #include <mutex>
     #include <string>
 
+    #include "../details/null_mutex.h"
+    #include "base_sink.h"
+
 // Avoid including windows.h (https://stackoverflow.com/a/30741042)
 extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
 extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();

include/spdlog/sinks/null_sink.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include <mutex>
+
 #include "../details/null_mutex.h"
 #include "../details/synchronous_factory.h"
 #include "base_sink.h"
 
-#include <mutex>
-
 namespace spdlog {
 namespace sinks {
 

include/spdlog/sinks/ostream_sink.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "../details/null_mutex.h"
-#include "base_sink.h"
-
 #include <mutex>
 #include <ostream>
 
+#include "../details/null_mutex.h"
+#include "base_sink.h"
+
 namespace spdlog {
 namespace sinks {
 template <typename Mutex>

include/spdlog/sinks/qt_sinks.h

@@ -11,15 +11,15 @@
 // If the widget's lifetime can be shorter than the logger's one, you should provide some permanent
 // QObject, and then use a standard signal/slot.
 //
-#include "base_sink.h"
-#include "../common.h"
-#include "../details/log_msg.h"
-#include "../details/synchronous_factory.h"
-
 #include <array>
 #include <QPlainTextEdit>
 #include <QTextEdit>
 
+#include "../common.h"
+#include "../details/log_msg.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
+
 //
 // qt_sink class
 //
@@ -224,9 +224,10 @@ protected:
     std::array<QTextCharFormat, level::n_levels> colors_;
 };
 
-#include "../details/null_mutex.h"
 #include <mutex>
 
+#include "../details/null_mutex.h"
+
 using qt_sink_mt = qt_sink<std::mutex>;
 using qt_sink_st = qt_sink<details::null_mutex>;
 using qt_color_sink_mt = qt_color_sink<std::mutex>;

include/spdlog/sinks/ringbuffer_sink.h

@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include "base_sink.h"
-#include "../details/circular_q.h"
-#include "../details/log_msg_buffer.h"
-#include "../details/null_mutex.h"
-
 #include <functional>
 #include <mutex>
 #include <string>
 #include <vector>
 
+#include "../details/circular_q.h"
+#include "../details/log_msg_buffer.h"
+#include "../details/null_mutex.h"
+#include "base_sink.h"
+
 namespace spdlog {
 namespace sinks {
 /*

include/spdlog/sinks/rotating_file_sink.h

@@ -3,15 +3,15 @@
 
 #pragma once
 
+#include <chrono>
+#include <mutex>
+#include <string>
+
 #include "../details/file_helper.h"
 #include "../details/null_mutex.h"
 #include "../details/synchronous_factory.h"
 #include "base_sink.h"
 
-#include <chrono>
-#include <mutex>
-#include <string>
-
 namespace spdlog {
 namespace sinks {
 //

include/spdlog/sinks/stdout_sinks.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include <cstdio>
+
 #include "../details/console_globals.h"
 #include "../details/synchronous_factory.h"
 #include "sink.h"
 
-#include <cstdio>
-
 #ifdef _WIN32
     #include "../details/windows_include.h"
 #endif

include/spdlog/sinks/syslog_sink.h

@@ -3,13 +3,14 @@
 
 #pragma once
 
-#include "../details/null_mutex.h"
-#include "../details/synchronous_factory.h"
-#include "base_sink.h"
+#include <syslog.h>
 
 #include <array>
 #include <string>
-#include <syslog.h>
+
+#include "../details/null_mutex.h"
+#include "../details/synchronous_factory.h"
+#include "base_sink.h"
 
 namespace spdlog {
 namespace sinks {

include/spdlog/sinks/systemd_sink.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include <array>
+
 #include "../details/null_mutex.h"
 #include "../details/os.h"
 #include "../details/synchronous_factory.h"
 #include "base_sink.h"
-
-#include <array>
 #ifndef SD_JOURNAL_SUPPRESS_LOCATION
     #define SD_JOURNAL_SUPPRESS_LOCATION
 #endif

include/spdlog/sinks/win_eventlog_sink.h

@@ -33,16 +33,16 @@ Windows Registry Editor Version 5.00
 
 #pragma once
 
-#include "../details/null_mutex.h"
-#include "base_sink.h"
-
-#include "../details/windows_include.h"
 #include <winbase.h>
 
 #include <mutex>
 #include <string>
 #include <vector>
 
+#include "../details/null_mutex.h"
+#include "../details/windows_include.h"
+#include "base_sink.h"
+
 namespace spdlog {
 namespace sinks {
 

include/spdlog/sinks/wincolor_sink.h

@@ -3,17 +3,17 @@
 
 #pragma once
 
-#include "../common.h"
-#include "../details/console_globals.h"
-#include "../details/null_mutex.h"
-#include "sink.h"
-
 #include <array>
 #include <cstdint>
 #include <memory>
 #include <mutex>
 #include <string>
 
+#include "../common.h"
+#include "../details/console_globals.h"
+#include "../details/null_mutex.h"
+#include "sink.h"
+
 namespace spdlog {
 namespace sinks {
 /*

include/spdlog/spdlog.h

@@ -9,17 +9,17 @@
 
 #pragma once
 
-#include "common.h"
-#include "logger.h"
-#include "version.h"
-#include "details/registry.h"
-#include "details/synchronous_factory.h"
-
 #include <chrono>
 #include <functional>
 #include <memory>
 #include <string>
 
+#include "common.h"
+#include "details/registry.h"
+#include "details/synchronous_factory.h"
+#include "logger.h"
+#include "version.h"
+
 namespace spdlog {
 
 using default_factory = synchronous_factory;

include/spdlog/stopwatch.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <chrono>
+
 #include "fmt/fmt.h"
 
 // Stopwatch support for spdlog  (using std::chrono::steady_clock).