Bump version to 1.13.0

with std::vector<char> buf(80),  80 elements are put in the vector, which is not the expected behavior.

.clang-format

@@ -1,109 +1,19 @@
 ---
 Language:        Cpp
-# BasedOnStyle:  LLVM
+BasedOnStyle:  Google
 AccessModifierOffset: -4
-AlignAfterOpenBracket: DontAlign
+Standard:        c++17
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:     
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: true
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     true
-  BeforeElse:      true
-  IndentBraces:    false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: true
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     140
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces:  false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:   
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
 IndentWidth:     4
-IndentWrappedFunctionNames: false
+TabWidth:        4
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-ReflowComments:  true
-SortIncludes:    false
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        8
 UseTab:          Never
-IndentPPDirectives: AfterHash
+ColumnLimit:     100
+AlignAfterOpenBracket: Align
+BinPackParameters: false
+AlignEscapedNewlines: Left
+AlwaysBreakTemplateDeclarations: Yes
+PackConstructorInitializers: Never
+BreakConstructorInitializersBeforeComma: false
+IndentPPDirectives: BeforeHash
+SortIncludes:    Never
 ...
 

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# clang-format
+1a0bfc7a89f2d58e22605a4dc7e18a9a555b65aa
+95c226e9c92928e20ccdac0d060e7241859e282b
+9d52261185b5f2c454c381d626ec5c84d7b195f4
+4b2a8219d5d1b40062d030441adde7d1fb0d4f84
+0a53eafe18d983c7c8ba4cadd02d0cc7f7308f28

.github/workflows/ci.yml

@@ -16,8 +16,6 @@ jobs:
           - { compiler: gcc, version: 9, build_type: Release, cppstd: 17 }
           - { compiler: gcc, version: 11, build_type: Debug, cppstd: 20 }
           - { compiler: gcc, version: 12, build_type: Release, cppstd: 20 }
-          - { compiler: clang, version: 10, build_type: Release, cppstd: 11 }
-          - { compiler: clang, version: 10, build_type: Debug, cppstd: 17, asan: OFF }
           - { compiler: clang, version: 12, build_type: Debug, cppstd: 17, asan: OFF }
           - { compiler: clang, version: 15, build_type: Release, cppstd: 20, asan: OFF }
     container:

.gitignore

@@ -72,6 +72,7 @@ install_manifest.txt
 /tests/logs/*
 spdlogConfig.cmake
 spdlogConfigVersion.cmake
+compile_commands.json
 
 # idea
 .idea/

CMakeLists.txt

@@ -1,6 +1,6 @@
 # Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
-cmake_minimum_required(VERSION 3.10...3.21)
+cmake_minimum_required(VERSION 3.11)
 
 # ---------------------------------------------------------------------------------------
 # Start spdlog project
@@ -18,7 +18,7 @@ include(GNUInstallDirs)
 # ---------------------------------------------------------------------------------------
 # Set default build to release
 # ---------------------------------------------------------------------------------------
-if(NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
 endif()
 
@@ -129,9 +129,7 @@ option(
 option(SPDLOG_DISABLE_DEFAULT_LOGGER "Disable default logger creation" OFF)
 
 # clang-tidy
-if(${CMAKE_VERSION} VERSION_GREATER "3.5")
+option(SPDLOG_TIDY "run clang-tidy" OFF)
-    option(SPDLOG_TIDY "run clang-tidy" OFF)
-endif()
 
 if(SPDLOG_TIDY)
     set(CMAKE_CXX_CLANG_TIDY "clang-tidy")
@@ -267,7 +265,7 @@ if(SPDLOG_NO_EXCEPTIONS)
     if(NOT MSVC)
         target_compile_options(spdlog PRIVATE -fno-exceptions)
     else()
-        target_compile_options(spdlog PRIVATE /EHsc)
+        target_compile_options(spdlog PRIVATE /EHs-c-)
     endif()
 endif()
 # ---------------------------------------------------------------------------------------
@@ -344,7 +342,8 @@ if(SPDLOG_INSTALL)
     # ---------------------------------------------------------------------------------------
     # Install CMake config files
     # ---------------------------------------------------------------------------------------
-    export(TARGETS spdlog NAMESPACE spdlog:: FILE "${CMAKE_CURRENT_BINARY_DIR}/${config_targets_file}")
+    export(TARGETS spdlog spdlog_header_only NAMESPACE spdlog::
+           FILE "${CMAKE_CURRENT_BINARY_DIR}/${config_targets_file}")
     install(EXPORT spdlog DESTINATION ${export_dest_dir} NAMESPACE spdlog:: FILE ${config_targets_file})
 
     include(CMakePackageConfigHelpers)

LICENSE

@@ -22,5 +22,5 @@ THE SOFTWARE.
 
 -- NOTE: Third party dependency used by this software --
 This software depends on the fmt lib (MIT License),
-and users must comply to its license: https://github.com/fmtlib/fmt/blob/master/LICENSE.rst
+and users must comply to its license: https://raw.githubusercontent.com/fmtlib/fmt/master/LICENSE
 

README.md

@@ -12,7 +12,6 @@ $ git clone https://github.com/gabime/spdlog.git
 $ cd spdlog && mkdir build && cd build
 $ cmake .. && make -j
 ```
-
 see example [CMakeLists.txt](https://github.com/gabime/spdlog/blob/v1.x/example/CMakeLists.txt) on how to use.
 
 ## Platforms

bench/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.11)
 project(spdlog_bench CXX)
 
 if(NOT TARGET spdlog)
@@ -12,19 +12,15 @@ find_package(Threads REQUIRED)
 find_package(benchmark CONFIG)
 if(NOT benchmark_FOUND)
     message(STATUS "Using CMake Version ${CMAKE_VERSION}")
-    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.11.0")
+    # User can fetch googlebenchmark
-        # User can fetch googlebenchmark
+    message(STATUS "Downloading GoogleBenchmark")
-        message(STATUS "Downloading GoogleBenchmark")
+    include(FetchContent)
-        include(FetchContent)
 
-        # disable tests
+    # disable tests
-        set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "")
+    set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "")
-        # Do not build and run googlebenchmark tests
+    # Do not build and run googlebenchmark tests
-        FetchContent_Declare(googlebenchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.6.0)
+    FetchContent_Declare(googlebenchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.6.0)
-        FetchContent_MakeAvailable(googlebenchmark)
+    FetchContent_MakeAvailable(googlebenchmark)
-    else()
-        message(FATAL_ERROR "GoogleBenchmark is missing. Use CMake >= 3.11 or download it")
-    endif()
 endif()
 
 add_executable(bench bench.cpp)

bench/async_bench.cpp

@@ -11,11 +11,11 @@
 #include "spdlog/sinks/basic_file_sink.h"
 
 #if defined(SPDLOG_USE_STD_FORMAT)
-#    include <format>
+    #include <format>
 #elif defined(SPDLOG_FMT_EXTERNAL)
-#    include <fmt/format.h>
+    #include <fmt/format.h>
 #else
-#    include "spdlog/fmt/bundled/format.h"
+    #include "spdlog/fmt/bundled/format.h"
 #endif
 
 #include "utils.h"
@@ -34,81 +34,69 @@ using namespace utils;
 void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
 
 #ifdef _MSC_VER
-#    pragma warning(push)
+    #pragma warning(push)
-#    pragma warning(disable : 4996) // disable fopen warning under msvc
+    #pragma warning(disable : 4996)  // disable fopen warning under msvc
-#endif                              // _MSC_VER
+#endif                               // _MSC_VER
 
-int count_lines(const char *filename)
+int count_lines(const char *filename) {
-{
     int counter = 0;
     auto *infile = fopen(filename, "r");
     int ch;
-    while (EOF != (ch = getc(infile)))
+    while (EOF != (ch = getc(infile))) {
-    {
+        if ('\n' == ch) counter++;
-        if ('\n' == ch)
-            counter++;
     }
     fclose(infile);
 
     return counter;
 }
 
-void verify_file(const char *filename, int expected_count)
+void verify_file(const char *filename, int expected_count) {
-{
     spdlog::info("Verifying {} to contain {} line..", filename, expected_count);
     auto count = count_lines(filename);
-    if (count != expected_count)
+    if (count != expected_count) {
-    {
+        spdlog::error("Test failed. {} has {} lines instead of {}", filename, count,
-        spdlog::error("Test failed. {} has {} lines instead of {}", filename, count, expected_count);
+                      expected_count);
         exit(1);
     }
     spdlog::info("Line count OK ({})\n", count);
 }
 
 #ifdef _MSC_VER
-#    pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[]) {
-{
-
     int howmany = 1000000;
     int queue_size = std::min(howmany + 2, 8192);
     int threads = 10;
     int iters = 3;
 
-    try
+    try {
-    {
         spdlog::set_pattern("[%^%l%$] %v");
-        if (argc == 1)
+        if (argc == 1) {
-        {
             spdlog::info("Usage: {} <message_count> <threads> <q_size> <iterations>", argv[0]);
             return 0;
         }
 
-        if (argc > 1)
+        if (argc > 1) howmany = atoi(argv[1]);
-            howmany = atoi(argv[1]);
+        if (argc > 2) threads = atoi(argv[2]);
-        if (argc > 2)
+        if (argc > 3) {
-            threads = atoi(argv[2]);
-        if (argc > 3)
-        {
             queue_size = atoi(argv[3]);
-            if (queue_size > 500000)
+            if (queue_size > 500000) {
-            {
                 spdlog::error("Max queue size allowed: 500,000");
                 exit(1);
             }
         }
 
-        if (argc > 4)
+        if (argc > 4) iters = atoi(argv[4]);
-            iters = atoi(argv[4]);
 
         auto slot_size = sizeof(spdlog::details::async_msg);
         spdlog::info("-------------------------------------------------");
         spdlog::info("Messages     : {:L}", howmany);
         spdlog::info("Threads      : {:L}", threads);
         spdlog::info("Queue        : {:L} slots", queue_size);
-        spdlog::info("Queue memory : {:L} x {:L} = {:L} KB ", queue_size, slot_size, (queue_size * slot_size) / 1024);
+        spdlog::info("Queue memory : {:L} x {:L} = {:L} KB ", queue_size, slot_size,
+                     (queue_size * slot_size) / 1024);
         spdlog::info("Total iters  : {:L}", iters);
         spdlog::info("-------------------------------------------------");
 
@@ -117,11 +105,11 @@ int main(int argc, char *argv[])
         spdlog::info("*********************************");
         spdlog::info("Queue Overflow Policy: block");
         spdlog::info("*********************************");
-        for (int i = 0; i < iters; i++)
+        for (int i = 0; i < iters; i++) {
-        {
             auto tp = std::make_shared<details::thread_pool>(queue_size, 1);
             auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
-            auto logger = std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::block);
+            auto logger = std::make_shared<async_logger>(
+                "async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::block);
             bench_mt(howmany, std::move(logger), threads);
             // verify_file(filename, howmany);
         }
@@ -132,18 +120,16 @@ int main(int argc, char *argv[])
         spdlog::info("*********************************");
         // do same test but discard oldest if queue is full instead of blocking
         filename = "logs/basic_async-overrun.log";
-        for (int i = 0; i < iters; i++)
+        for (int i = 0; i < iters; i++) {
-        {
             auto tp = std::make_shared<details::thread_pool>(queue_size, 1);
             auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
             auto logger =
-                std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::overrun_oldest);
+                std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp),
+                                               async_overflow_policy::overrun_oldest);
             bench_mt(howmany, std::move(logger), threads);
         }
         spdlog::shutdown();
-    }
+    } catch (std::exception &ex) {
-    catch (std::exception &ex)
-    {
         std::cerr << "Error: " << ex.what() << std::endl;
         perror("Last error");
         return 1;
@@ -151,32 +137,28 @@ int main(int argc, char *argv[])
     return 0;
 }
 
-void thread_fun(std::shared_ptr<spdlog::logger> logger, int howmany)
+void thread_fun(std::shared_ptr<spdlog::logger> logger, int howmany) {
-{
+    for (int i = 0; i < howmany; i++) {
-    for (int i = 0; i < howmany; i++)
-    {
         logger->info("Hello logger: msg number {}", i);
     }
 }
 
-void bench_mt(int howmany, std::shared_ptr<spdlog::logger> logger, int thread_count)
+void bench_mt(int howmany, std::shared_ptr<spdlog::logger> logger, int thread_count) {
-{
     using std::chrono::high_resolution_clock;
     vector<std::thread> threads;
     auto start = high_resolution_clock::now();
 
     int msgs_per_thread = howmany / thread_count;
     int msgs_per_thread_mod = howmany % thread_count;
-    for (int t = 0; t < thread_count; ++t)
+    for (int t = 0; t < thread_count; ++t) {
-    {
         if (t == 0 && msgs_per_thread_mod)
-            threads.push_back(std::thread(thread_fun, logger, msgs_per_thread + msgs_per_thread_mod));
+            threads.push_back(
+                std::thread(thread_fun, logger, msgs_per_thread + msgs_per_thread_mod));
         else
             threads.push_back(std::thread(thread_fun, logger, msgs_per_thread));
     }
 
-    for (auto &t : threads)
+    for (auto &t : threads) {
-    {
         t.join();
     };
 

bench/bench.cpp

@@ -13,16 +13,16 @@
 #include "spdlog/sinks/rotating_file_sink.h"
 
 #if defined(SPDLOG_USE_STD_FORMAT)
-#    include <format>
+    #include <format>
 #elif defined(SPDLOG_FMT_EXTERNAL)
-#    include <fmt/format.h>
+    #include <fmt/format.h>
 #else
-#    include "spdlog/fmt/bundled/format.h"
+    #include "spdlog/fmt/bundled/format.h"
 #endif
 
 #include "utils.h"
 #include <atomic>
-#include <cstdlib> // EXIT_FAILURE
+#include <cstdlib>  // EXIT_FAILURE
 #include <memory>
 #include <string>
 #include <thread>
@@ -37,22 +37,25 @@ static const size_t file_size = 30 * 1024 * 1024;
 static const size_t rotating_files = 5;
 static const int max_threads = 1000;
 
-void bench_threaded_logging(size_t threads, int iters)
+void bench_threaded_logging(size_t threads, int iters) {
-{
     spdlog::info("**************************************************************");
-    spdlog::info(spdlog::fmt_lib::format(std::locale("en_US.UTF-8"), "Multi threaded: {:L} threads, {:L} messages", threads, iters));
+    spdlog::info(spdlog::fmt_lib::format(
+        std::locale("en_US.UTF-8"), "Multi threaded: {:L} threads, {:L} messages", threads, iters));
     spdlog::info("**************************************************************");
 
     auto basic_mt = spdlog::basic_logger_mt("basic_mt", "logs/basic_mt.log", true);
     bench_mt(iters, std::move(basic_mt), threads);
-    auto basic_mt_tracing = spdlog::basic_logger_mt("basic_mt/backtrace-on", "logs/basic_mt.log", true);
+    auto basic_mt_tracing =
+        spdlog::basic_logger_mt("basic_mt/backtrace-on", "logs/basic_mt.log", true);
     basic_mt_tracing->enable_backtrace(32);
     bench_mt(iters, std::move(basic_mt_tracing), threads);
 
     spdlog::info("");
-    auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "logs/rotating_mt.log", file_size, rotating_files);
+    auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "logs/rotating_mt.log", file_size,
+                                                  rotating_files);
     bench_mt(iters, std::move(rotating_mt), threads);
-    auto rotating_mt_tracing = spdlog::rotating_logger_mt("rotating_mt/backtrace-on", "logs/rotating_mt.log", file_size, rotating_files);
+    auto rotating_mt_tracing = spdlog::rotating_logger_mt(
+        "rotating_mt/backtrace-on", "logs/rotating_mt.log", file_size, rotating_files);
     rotating_mt_tracing->enable_backtrace(32);
     bench_mt(iters, std::move(rotating_mt_tracing), threads);
 
@@ -73,22 +76,25 @@ void bench_threaded_logging(size_t threads, int iters)
     bench(iters, empty_logger_tracing);
 }
 
-void bench_single_threaded(int iters)
+void bench_single_threaded(int iters) {
-{
     spdlog::info("**************************************************************");
-    spdlog::info(spdlog::fmt_lib::format(std::locale("en_US.UTF-8"), "Single threaded: {} messages", iters));
+    spdlog::info(
+        spdlog::fmt_lib::format(std::locale("en_US.UTF-8"), "Single threaded: {} messages", iters));
     spdlog::info("**************************************************************");
 
     auto basic_st = spdlog::basic_logger_st("basic_st", "logs/basic_st.log", true);
     bench(iters, std::move(basic_st));
 
-    auto basic_st_tracing = spdlog::basic_logger_st("basic_st/backtrace-on", "logs/basic_st.log", true);
+    auto basic_st_tracing =
+        spdlog::basic_logger_st("basic_st/backtrace-on", "logs/basic_st.log", true);
     bench(iters, std::move(basic_st_tracing));
 
     spdlog::info("");
-    auto rotating_st = spdlog::rotating_logger_st("rotating_st", "logs/rotating_st.log", file_size, rotating_files);
+    auto rotating_st = spdlog::rotating_logger_st("rotating_st", "logs/rotating_st.log", file_size,
+                                                  rotating_files);
     bench(iters, std::move(rotating_st));
-    auto rotating_st_tracing = spdlog::rotating_logger_st("rotating_st/backtrace-on", "logs/rotating_st.log", file_size, rotating_files);
+    auto rotating_st_tracing = spdlog::rotating_logger_st(
+        "rotating_st/backtrace-on", "logs/rotating_st.log", file_size, rotating_files);
     rotating_st_tracing->enable_backtrace(32);
     bench(iters, std::move(rotating_st_tracing));
 
@@ -110,63 +116,54 @@ void bench_single_threaded(int iters)
     bench(iters, empty_logger_tracing);
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[]) {
-{
     spdlog::set_automatic_registration(false);
     spdlog::default_logger()->set_pattern("[%^%l%$] %v");
     int iters = 250000;
     size_t threads = 4;
-    try
+    try {
-    {
+        if (argc > 1) {
-
-        if (argc > 1)
-        {
             iters = std::stoi(argv[1]);
         }
-        if (argc > 2)
+        if (argc > 2) {
-        {
             threads = std::stoul(argv[2]);
         }
 
-        if (threads > max_threads)
+        if (threads > max_threads) {
-        {
+            throw std::runtime_error(
-            throw std::runtime_error(spdlog::fmt_lib::format("Number of threads exceeds maximum({})", max_threads));
+                spdlog::fmt_lib::format("Number of threads exceeds maximum({})", max_threads));
         }
 
         bench_single_threaded(iters);
         bench_threaded_logging(1, iters);
         bench_threaded_logging(threads, iters);
-    }
+    } catch (std::exception &ex) {
-    catch (std::exception &ex)
-    {
         spdlog::error(ex.what());
         return EXIT_FAILURE;
     }
     return EXIT_SUCCESS;
 }
 
-void bench(int howmany, std::shared_ptr<spdlog::logger> log)
+void bench(int howmany, std::shared_ptr<spdlog::logger> log) {
-{
     using std::chrono::duration;
     using std::chrono::duration_cast;
     using std::chrono::high_resolution_clock;
 
     auto start = high_resolution_clock::now();
-    for (auto i = 0; i < howmany; ++i)
+    for (auto i = 0; i < howmany; ++i) {
-    {
         log->info("Hello logger: msg number {}", i);
     }
 
     auto delta = high_resolution_clock::now() - start;
     auto delta_d = duration_cast<duration<double>>(delta).count();
 
-    spdlog::info(spdlog::fmt_lib::format(
+    spdlog::info(spdlog::fmt_lib::format(std::locale("en_US.UTF-8"),
-        std::locale("en_US.UTF-8"), "{:<30} Elapsed: {:0.2f} secs {:>16L}/sec", log->name(), delta_d, int(howmany / delta_d)));
+                                         "{:<30} Elapsed: {:0.2f} secs {:>16L}/sec", log->name(),
+                                         delta_d, size_t(howmany / delta_d)));
     spdlog::drop(log->name());
 }
 
-void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, size_t thread_count)
+void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, size_t thread_count) {
-{
     using std::chrono::duration;
     using std::chrono::duration_cast;
     using std::chrono::high_resolution_clock;
@@ -174,25 +171,23 @@ void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, size_t thread_co
     std::vector<std::thread> threads;
     threads.reserve(thread_count);
     auto start = high_resolution_clock::now();
-    for (size_t t = 0; t < thread_count; ++t)
+    for (size_t t = 0; t < thread_count; ++t) {
-    {
         threads.emplace_back([&]() {
-            for (int j = 0; j < howmany / static_cast<int>(thread_count); j++)
+            for (int j = 0; j < howmany / static_cast<int>(thread_count); j++) {
-            {
                 log->info("Hello logger: msg number {}", j);
             }
         });
     }
 
-    for (auto &t : threads)
+    for (auto &t : threads) {
-    {
         t.join();
     };
 
     auto delta = high_resolution_clock::now() - start;
     auto delta_d = duration_cast<duration<double>>(delta).count();
-    spdlog::info(spdlog::fmt_lib::format(
+    spdlog::info(spdlog::fmt_lib::format(std::locale("en_US.UTF-8"),
-        std::locale("en_US.UTF-8"), "{:<30} Elapsed: {:0.2f} secs {:>16L}/sec", log->name(), delta_d, int(howmany / delta_d)));
+                                         "{:<30} Elapsed: {:0.2f} secs {:>16L}/sec", log->name(),
+                                         delta_d, size_t(howmany / delta_d)));
     spdlog::drop(log->name());
 }
 
@@ -215,7 +210,8 @@ void bench_default_api(int howmany, std::shared_ptr<spdlog::logger> log)
     auto delta_d = duration_cast<duration<double>>(delta).count();
     spdlog::drop(log->name());
     spdlog::set_default_logger(std::move(orig_default));
-    spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16}/sec", log->name(), delta_d, int(howmany / delta_d));
+    spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16}/sec", log->name(), delta_d, int(howmany /
+delta_d));
 }
 
 void bench_c_string(int howmany, std::shared_ptr<spdlog::logger> log)
@@ -224,11 +220,12 @@ void bench_c_string(int howmany, std::shared_ptr<spdlog::logger> log)
     using std::chrono::duration;
     using std::chrono::duration_cast;
 
-    const char *msg = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pharetra metus cursus "
+    const char *msg = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pharetra
-                      "lacus placerat congue. Nulla egestas, mauris a tincidunt tempus, enim lectus volutpat mi, eu consequat sem "
+metus cursus " "lacus placerat congue. Nulla egestas, mauris a tincidunt tempus, enim lectus
-                      "libero nec massa. In dapibus ipsum a diam rhoncus gravida. Etiam non dapibus eros. Donec fringilla dui sed "
+volutpat mi, eu consequat sem " "libero nec massa. In dapibus ipsum a diam rhoncus gravida. Etiam
-                      "augue pretium, nec scelerisque est maximus. Nullam convallis, sem nec blandit maximus, nisi turpis ornare "
+non dapibus eros. Donec fringilla dui sed " "augue pretium, nec scelerisque est maximus. Nullam
-                      "nisl, sit amet volutpat neque massa eu odio. Maecenas malesuada quam ex, posuere congue nibh turpis duis.";
+convallis, sem nec blandit maximus, nisi turpis ornare " "nisl, sit amet volutpat neque massa eu
+odio. Maecenas malesuada quam ex, posuere congue nibh turpis duis.";
 
     auto orig_default = spdlog::default_logger();
     spdlog::set_default_logger(log);
@@ -242,7 +239,8 @@ void bench_c_string(int howmany, std::shared_ptr<spdlog::logger> log)
     auto delta_d = duration_cast<duration<double>>(delta).count();
     spdlog::drop(log->name());
     spdlog::set_default_logger(std::move(orig_default));
-    spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16}/sec", log->name(), delta_d, int(howmany / delta_d));
+    spdlog::info("{:<30} Elapsed: {:0.2f} secs {:>16}/sec", log->name(), delta_d, int(howmany /
+delta_d));
 }
 
 */

bench/formatter-bench.cpp

@@ -8,31 +8,28 @@
 #include "spdlog/spdlog.h"
 #include "spdlog/pattern_formatter.h"
 
-void bench_formatter(benchmark::State &state, std::string pattern)
+void bench_formatter(benchmark::State &state, std::string pattern) {
-{
     auto formatter = spdlog::details::make_unique<spdlog::pattern_formatter>(pattern);
     spdlog::memory_buf_t dest;
     std::string logger_name = "logger-name";
-    const char *text = "Hello. This is some message with length of 80                                   ";
+    const char *text =
+        "Hello. This is some message with length of 80                                   ";
 
     spdlog::source_loc source_loc{"a/b/c/d/myfile.cpp", 123, "some_func()"};
     spdlog::details::log_msg msg(source_loc, logger_name, spdlog::level::info, text);
 
-    for (auto _ : state)
+    for (auto _ : state) {
-    {
         dest.clear();
         formatter->format(msg, dest);
         benchmark::DoNotOptimize(dest);
     }
 }
 
-void bench_formatters()
+void bench_formatters() {
-{
     // basic patterns(single flag)
     std::string all_flags = "+vtPnlLaAbBcCYDmdHIMSefFprRTXzEisg@luioO%";
     std::vector<std::string> basic_patterns;
-    for (auto &flag : all_flags)
+    for (auto &flag : all_flags) {
-    {
         auto pattern = std::string("%") + flag;
         benchmark::RegisterBenchmark(pattern.c_str(), &bench_formatter, pattern);
 
@@ -50,29 +47,23 @@ void bench_formatters()
         "[%Y-%m-%d %H:%M:%S.%e] [%l] [%n] %v",
         "[%Y-%m-%d %H:%M:%S.%e] [%l] [%n] [%t] %v",
     };
-    for (auto &pattern : patterns)
+    for (auto &pattern : patterns) {
-    {
+        benchmark::RegisterBenchmark(pattern.c_str(), &bench_formatter, pattern)
-        benchmark::RegisterBenchmark(pattern.c_str(), &bench_formatter, pattern)->Iterations(2500000);
+            ->Iterations(2500000);
     }
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[]) {
-{
-
     spdlog::set_pattern("[%^%l%$] %v");
-    if (argc != 2)
+    if (argc != 2) {
-    {
         spdlog::error("Usage: {} <pattern> (or \"all\" to bench all)", argv[0]);
         exit(1);
     }
 
     std::string pattern = argv[1];
-    if (pattern == "all")
+    if (pattern == "all") {
-    {
         bench_formatters();
-    }
+    } else {
-    else
-    {
         benchmark::RegisterBenchmark(pattern.c_str(), &bench_formatter, pattern);
     }
     benchmark::Initialize(&argc, argv);

bench/latency.cpp

@@ -16,76 +16,72 @@
 #include "spdlog/sinks/null_sink.h"
 #include "spdlog/sinks/rotating_file_sink.h"
 
-void bench_c_string(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
+void bench_c_string(benchmark::State &state, std::shared_ptr<spdlog::logger> logger) {
-{
+    const char *msg =
-    const char *msg = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pharetra metus cursus "
+        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum pharetra metus cursus "
-                      "lacus placerat congue. Nulla egestas, mauris a tincidunt tempus, enim lectus volutpat mi, eu consequat sem "
+        "lacus placerat congue. Nulla egestas, mauris a tincidunt tempus, enim lectus volutpat mi, "
-                      "libero nec massa. In dapibus ipsum a diam rhoncus gravida. Etiam non dapibus eros. Donec fringilla dui sed "
+        "eu consequat sem "
-                      "augue pretium, nec scelerisque est maximus. Nullam convallis, sem nec blandit maximus, nisi turpis ornare "
+        "libero nec massa. In dapibus ipsum a diam rhoncus gravida. Etiam non dapibus eros. Donec "
-                      "nisl, sit amet volutpat neque massa eu odio. Maecenas malesuada quam ex, posuere congue nibh turpis duis.";
+        "fringilla dui sed "
+        "augue pretium, nec scelerisque est maximus. Nullam convallis, sem nec blandit maximus, "
+        "nisi turpis ornare "
+        "nisl, sit amet volutpat neque massa eu odio. Maecenas malesuada quam ex, posuere congue "
+        "nibh turpis duis.";
 
-    for (auto _ : state)
+    for (auto _ : state) {
-    {
         logger->info(msg);
     }
 }
 
-void bench_logger(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
+void bench_logger(benchmark::State &state, std::shared_ptr<spdlog::logger> logger) {
-{
     int i = 0;
-    for (auto _ : state)
+    for (auto _ : state) {
-    {
         logger->info("Hello logger: msg number {}...............", ++i);
     }
 }
-void bench_global_logger(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
+void bench_global_logger(benchmark::State &state, std::shared_ptr<spdlog::logger> logger) {
-{
     spdlog::set_default_logger(std::move(logger));
     int i = 0;
-    for (auto _ : state)
+    for (auto _ : state) {
-    {
         spdlog::info("Hello logger: msg number {}...............", ++i);
     }
 }
 
-void bench_disabled_macro(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
+void bench_disabled_macro(benchmark::State &state, std::shared_ptr<spdlog::logger> logger) {
-{
     int i = 0;
-    benchmark::DoNotOptimize(i);      // prevent unused warnings
+    benchmark::DoNotOptimize(i);       // prevent unused warnings
-    benchmark::DoNotOptimize(logger); // prevent unused warnings
+    benchmark::DoNotOptimize(logger);  // prevent unused warnings
-    for (auto _ : state)
+    for (auto _ : state) {
-    {
         SPDLOG_LOGGER_DEBUG(logger, "Hello logger: msg number {}...............", i++);
     }
 }
 
-void bench_disabled_macro_global_logger(benchmark::State &state, std::shared_ptr<spdlog::logger> logger)
+void bench_disabled_macro_global_logger(benchmark::State &state,
-{
+                                        std::shared_ptr<spdlog::logger> logger) {
     spdlog::set_default_logger(std::move(logger));
     int i = 0;
-    benchmark::DoNotOptimize(i);      // prevent unused warnings
+    benchmark::DoNotOptimize(i);       // prevent unused warnings
-    benchmark::DoNotOptimize(logger); // prevent unused warnings
+    benchmark::DoNotOptimize(logger);  // prevent unused warnings
-    for (auto _ : state)
+    for (auto _ : state) {
-    {
         SPDLOG_DEBUG("Hello logger: msg number {}...............", i++);
     }
 }
 
 #ifdef __linux__
-void bench_dev_null()
+void bench_dev_null() {
-{
     auto dev_null_st = spdlog::basic_logger_st("/dev/null_st", "/dev/null");
-    benchmark::RegisterBenchmark("/dev/null_st", bench_logger, std::move(dev_null_st))->UseRealTime();
+    benchmark::RegisterBenchmark("/dev/null_st", bench_logger, std::move(dev_null_st))
+        ->UseRealTime();
     spdlog::drop("/dev/null_st");
 
     auto dev_null_mt = spdlog::basic_logger_mt("/dev/null_mt", "/dev/null");
-    benchmark::RegisterBenchmark("/dev/null_mt", bench_logger, std::move(dev_null_mt))->UseRealTime();
+    benchmark::RegisterBenchmark("/dev/null_mt", bench_logger, std::move(dev_null_mt))
+        ->UseRealTime();
     spdlog::drop("/dev/null_mt");
 }
-#endif // __linux__
+#endif  // __linux__
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[]) {
-{
     using spdlog::sinks::null_sink_mt;
     using spdlog::sinks::null_sink_st;
 
@@ -96,79 +92,108 @@ int main(int argc, char *argv[])
     auto full_bench = argc > 1 && std::string(argv[1]) == "full";
 
     // disabled loggers
-    auto disabled_logger = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
+    auto disabled_logger =
+        std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
     disabled_logger->set_level(spdlog::level::off);
     benchmark::RegisterBenchmark("disabled-at-compile-time", bench_disabled_macro, disabled_logger);
-    benchmark::RegisterBenchmark("disabled-at-compile-time (global logger)", bench_disabled_macro_global_logger, disabled_logger);
+    benchmark::RegisterBenchmark("disabled-at-compile-time (global logger)",
+                                 bench_disabled_macro_global_logger, disabled_logger);
     benchmark::RegisterBenchmark("disabled-at-runtime", bench_logger, disabled_logger);
-    benchmark::RegisterBenchmark("disabled-at-runtime (global logger)", bench_global_logger, disabled_logger);
+    benchmark::RegisterBenchmark("disabled-at-runtime (global logger)", bench_global_logger,
+                                 disabled_logger);
     // with backtrace of 64
-    auto tracing_disabled_logger = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
+    auto tracing_disabled_logger =
+        std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
     tracing_disabled_logger->enable_backtrace(64);
-    benchmark::RegisterBenchmark("disabled-at-runtime/backtrace", bench_logger, tracing_disabled_logger);
+    benchmark::RegisterBenchmark("disabled-at-runtime/backtrace", bench_logger,
+                                 tracing_disabled_logger);
 
-    auto null_logger_st = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_st>());
+    auto null_logger_st =
-    benchmark::RegisterBenchmark("null_sink_st (500_bytes c_str)", bench_c_string, std::move(null_logger_st));
+        std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_st>());
+    benchmark::RegisterBenchmark("null_sink_st (500_bytes c_str)", bench_c_string,
+                                 std::move(null_logger_st));
     benchmark::RegisterBenchmark("null_sink_st", bench_logger, null_logger_st);
-    benchmark::RegisterBenchmark("null_sink_st (global logger)", bench_global_logger, null_logger_st);
+    benchmark::RegisterBenchmark("null_sink_st (global logger)", bench_global_logger,
+                                 null_logger_st);
     // with backtrace of 64
-    auto tracing_null_logger_st = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_st>());
+    auto tracing_null_logger_st =
+        std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_st>());
     tracing_null_logger_st->enable_backtrace(64);
     benchmark::RegisterBenchmark("null_sink_st/backtrace", bench_logger, tracing_null_logger_st);
 
 #ifdef __linux
     bench_dev_null();
-#endif // __linux__
+#endif  // __linux__
 
-    if (full_bench)
+    if (full_bench) {
-    {
         // basic_st
         auto basic_st = spdlog::basic_logger_st("basic_st", "latency_logs/basic_st.log", true);
         benchmark::RegisterBenchmark("basic_st", bench_logger, std::move(basic_st))->UseRealTime();
         spdlog::drop("basic_st");
         // with backtrace of 64
-        auto tracing_basic_st = spdlog::basic_logger_st("tracing_basic_st", "latency_logs/tracing_basic_st.log", true);
+        auto tracing_basic_st =
+            spdlog::basic_logger_st("tracing_basic_st", "latency_logs/tracing_basic_st.log", true);
         tracing_basic_st->enable_backtrace(64);
-        benchmark::RegisterBenchmark("basic_st/backtrace", bench_logger, std::move(tracing_basic_st))->UseRealTime();
+        benchmark::RegisterBenchmark("basic_st/backtrace", bench_logger,
+                                     std::move(tracing_basic_st))
+            ->UseRealTime();
         spdlog::drop("tracing_basic_st");
 
         // rotating st
-        auto rotating_st = spdlog::rotating_logger_st("rotating_st", "latency_logs/rotating_st.log", file_size, rotating_files);
+        auto rotating_st = spdlog::rotating_logger_st("rotating_st", "latency_logs/rotating_st.log",
-        benchmark::RegisterBenchmark("rotating_st", bench_logger, std::move(rotating_st))->UseRealTime();
+                                                      file_size, rotating_files);
+        benchmark::RegisterBenchmark("rotating_st", bench_logger, std::move(rotating_st))
+            ->UseRealTime();
         spdlog::drop("rotating_st");
         // with backtrace of 64
-        auto tracing_rotating_st =
+        auto tracing_rotating_st = spdlog::rotating_logger_st(
-            spdlog::rotating_logger_st("tracing_rotating_st", "latency_logs/tracing_rotating_st.log", file_size, rotating_files);
+            "tracing_rotating_st", "latency_logs/tracing_rotating_st.log", file_size,
-        benchmark::RegisterBenchmark("rotating_st/backtrace", bench_logger, std::move(tracing_rotating_st))->UseRealTime();
+            rotating_files);
+        benchmark::RegisterBenchmark("rotating_st/backtrace", bench_logger,
+                                     std::move(tracing_rotating_st))
+            ->UseRealTime();
         spdlog::drop("tracing_rotating_st");
 
         // daily st
         auto daily_st = spdlog::daily_logger_mt("daily_st", "latency_logs/daily_st.log");
         benchmark::RegisterBenchmark("daily_st", bench_logger, std::move(daily_st))->UseRealTime();
         spdlog::drop("daily_st");
-        auto tracing_daily_st = spdlog::daily_logger_mt("tracing_daily_st", "latency_logs/daily_st.log");
+        auto tracing_daily_st =
-        benchmark::RegisterBenchmark("daily_st/backtrace", bench_logger, std::move(tracing_daily_st))->UseRealTime();
+            spdlog::daily_logger_mt("tracing_daily_st", "latency_logs/daily_st.log");
+        benchmark::RegisterBenchmark("daily_st/backtrace", bench_logger,
+                                     std::move(tracing_daily_st))
+            ->UseRealTime();
         spdlog::drop("tracing_daily_st");
 
         //
         // Multi threaded bench, 10 loggers using same logger concurrently
         //
-        auto null_logger_mt = std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
+        auto null_logger_mt =
-        benchmark::RegisterBenchmark("null_sink_mt", bench_logger, null_logger_mt)->Threads(n_threads)->UseRealTime();
+            std::make_shared<spdlog::logger>("bench", std::make_shared<null_sink_mt>());
+        benchmark::RegisterBenchmark("null_sink_mt", bench_logger, null_logger_mt)
+            ->Threads(n_threads)
+            ->UseRealTime();
 
         // basic_mt
         auto basic_mt = spdlog::basic_logger_mt("basic_mt", "latency_logs/basic_mt.log", true);
-        benchmark::RegisterBenchmark("basic_mt", bench_logger, std::move(basic_mt))->Threads(n_threads)->UseRealTime();
+        benchmark::RegisterBenchmark("basic_mt", bench_logger, std::move(basic_mt))
+            ->Threads(n_threads)
+            ->UseRealTime();
         spdlog::drop("basic_mt");
 
         // rotating mt
-        auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "latency_logs/rotating_mt.log", file_size, rotating_files);
+        auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "latency_logs/rotating_mt.log",
-        benchmark::RegisterBenchmark("rotating_mt", bench_logger, std::move(rotating_mt))->Threads(n_threads)->UseRealTime();
+                                                      file_size, rotating_files);
+        benchmark::RegisterBenchmark("rotating_mt", bench_logger, std::move(rotating_mt))
+            ->Threads(n_threads)
+            ->UseRealTime();
         spdlog::drop("rotating_mt");
 
         // daily mt
         auto daily_mt = spdlog::daily_logger_mt("daily_mt", "latency_logs/daily_mt.log");
-        benchmark::RegisterBenchmark("daily_mt", bench_logger, std::move(daily_mt))->Threads(n_threads)->UseRealTime();
+        benchmark::RegisterBenchmark("daily_mt", bench_logger, std::move(daily_mt))
+            ->Threads(n_threads)
+            ->UseRealTime();
         spdlog::drop("daily_mt");
     }
 
@@ -176,13 +201,19 @@ int main(int argc, char *argv[])
     auto queue_size = 1024 * 1024 * 3;
     auto tp = std::make_shared<spdlog::details::thread_pool>(queue_size, 1);
     auto async_logger = std::make_shared<spdlog::async_logger>(
-        "async_logger", std::make_shared<null_sink_mt>(), std::move(tp), spdlog::async_overflow_policy::overrun_oldest);
+        "async_logger", std::make_shared<null_sink_mt>(), std::move(tp),
-    benchmark::RegisterBenchmark("async_logger", bench_logger, async_logger)->Threads(n_threads)->UseRealTime();
+        spdlog::async_overflow_policy::overrun_oldest);
+    benchmark::RegisterBenchmark("async_logger", bench_logger, async_logger)
+        ->Threads(n_threads)
+        ->UseRealTime();
 
     auto async_logger_tracing = std::make_shared<spdlog::async_logger>(
-        "async_logger_tracing", std::make_shared<null_sink_mt>(), std::move(tp), spdlog::async_overflow_policy::overrun_oldest);
+        "async_logger_tracing", std::make_shared<null_sink_mt>(), std::move(tp),
+        spdlog::async_overflow_policy::overrun_oldest);
     async_logger_tracing->enable_backtrace(32);
-    benchmark::RegisterBenchmark("async_logger/tracing", bench_logger, async_logger_tracing)->Threads(n_threads)->UseRealTime();
+    benchmark::RegisterBenchmark("async_logger/tracing", bench_logger, async_logger_tracing)
+        ->Threads(n_threads)
+        ->UseRealTime();
 
     benchmark::Initialize(&argc, argv);
     benchmark::RunSpecifiedBenchmarks();

bench/utils.h

@@ -11,9 +11,8 @@
 
 namespace utils {
 
-template<typename T>
+template <typename T>
-inline std::string format(const T &value)
+inline std::string format(const T &value) {
-{
     static std::locale loc("");
     std::stringstream ss;
     ss.imbue(loc);
@@ -21,9 +20,8 @@ inline std::string format(const T &value)
     return ss.str();
 }
 
-template<>
+template <>
-inline std::string format(const double &value)
+inline std::string format(const double &value) {
-{
     static std::locale loc("");
     std::stringstream ss;
     ss.imbue(loc);
@@ -31,4 +29,4 @@ inline std::string format(const double &value)
     return ss.str();
 }
 
-} // namespace utils
+}  // namespace utils

example/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.11)
 project(spdlog_examples CXX)
 
 if(NOT TARGET spdlog)

example/example.cpp

@@ -28,16 +28,15 @@ void file_events_example();
 void replace_default_logger_example();
 
 #include "spdlog/spdlog.h"
-#include "spdlog/cfg/env.h"  // support for loading levels from the environment variable
+#include "spdlog/cfg/env.h"   // support for loading levels from the environment variable
-#include "spdlog/fmt/ostr.h" // support for user defined types
+#include "spdlog/fmt/ostr.h"  // support for user defined types
 
-
+int main(int, char *[]) {
-int main(int, char *[])
-{
     // Log levels can be loaded from argv/env using "SPDLOG_LEVEL"
     load_levels_example();
 
-    spdlog::info("Welcome to spdlog version {}.{}.{}  !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH);
+    spdlog::info("Welcome to spdlog version {}.{}.{}  !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR,
+                 SPDLOG_VER_PATCH);
 
     spdlog::warn("Easy padding in numbers like {:08d}", 12);
     spdlog::critical("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
@@ -46,30 +45,28 @@ int main(int, char *[])
     spdlog::info("{:>8} aligned, {:<8} aligned", "right", "left");
 
     // Runtime log levels
-    spdlog::set_level(spdlog::level::info); // Set global log level to info
+    spdlog::set_level(spdlog::level::info);  // Set global log level to info
     spdlog::debug("This message should not be displayed!");
-    spdlog::set_level(spdlog::level::trace); // Set specific logger's log level
+    spdlog::set_level(spdlog::level::trace);  // Set specific logger's log level
     spdlog::debug("This message should be displayed..");
 
     // Customize msg format for all loggers
     spdlog::set_pattern("[%H:%M:%S %z] [%^%L%$] [thread %t] %v");
     spdlog::info("This an info message with custom format");
-    spdlog::set_pattern("%+"); // back to default format
+    spdlog::set_pattern("%+");  // back to default format
     spdlog::set_level(spdlog::level::info);
 
     // Backtrace support
     // Loggers can store in a ring buffer all messages (including debug/trace) for later inspection.
     // When needed, call dump_backtrace() to see what happened:
-    spdlog::enable_backtrace(10); // create ring buffer with capacity of 10  messages
+    spdlog::enable_backtrace(10);  // create ring buffer with capacity of 10  messages
-    for (int i = 0; i < 100; i++)
+    for (int i = 0; i < 100; i++) {
-    {
+        spdlog::debug("Backtrace message {}", i);  // not logged..
-        spdlog::debug("Backtrace message {}", i); // not logged..
     }
     // e.g. if some error happened:
-    spdlog::dump_backtrace(); // log them now!
+    spdlog::dump_backtrace();  // log them now!
 
-    try
+    try {
-    {
         stdout_logger_example();
         basic_example();
         rotating_example();
@@ -101,8 +98,7 @@ int main(int, char *[])
     }
 
     // Exceptions will only be thrown upon failed logger or sink construction (not during logging).
-    catch (const spdlog::spdlog_ex &ex)
+    catch (const spdlog::spdlog_ex &ex) {
-    {
         std::printf("Log initialization failed: %s\n", ex.what());
         return 1;
     }
@@ -110,8 +106,7 @@ int main(int, char *[])
 
 #include "spdlog/sinks/stdout_color_sinks.h"
 // or #include "spdlog/sinks/stdout_sinks.h" if no colors needed.
-void stdout_logger_example()
+void stdout_logger_example() {
-{
     // Create color multi threaded logger.
     auto console = spdlog::stdout_color_mt("console");
     // or for stderr:
@@ -119,38 +114,35 @@ void stdout_logger_example()
 }
 
 #include "spdlog/sinks/basic_file_sink.h"
-void basic_example()
+void basic_example() {
-{
     // Create basic file logger (not rotated).
     auto my_logger = spdlog::basic_logger_mt("file_logger", "logs/basic-log.txt", true);
 }
 
 #include "spdlog/sinks/rotating_file_sink.h"
-void rotating_example()
+void rotating_example() {
-{
     // Create a file rotating logger with 5mb size max and 3 rotated files.
-    auto rotating_logger = spdlog::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
+    auto rotating_logger =
+        spdlog::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
 }
 
 #include "spdlog/sinks/daily_file_sink.h"
-void daily_example()
+void daily_example() {
-{
     // Create a daily logger - a new file is created every day on 2:30am.
     auto daily_logger = spdlog::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
 }
 
 #include "spdlog/sinks/callback_sink.h"
-void callback_example()
+void callback_example() {
-{
     // Create the logger
-    auto logger = spdlog::callback_logger_mt("custom_callback_logger", [](const spdlog::details::log_msg & /*msg*/) {
+    auto logger = spdlog::callback_logger_mt("custom_callback_logger",
-        // do what you need to do with msg
+                                             [](const spdlog::details::log_msg & /*msg*/) {
-    });
+                                                 // do what you need to do with msg
+                                             });
 }
 
 #include "spdlog/cfg/env.h"
-void load_levels_example()
+void load_levels_example() {
-{
     // Set the log level to "info" and mylogger to "trace":
     // SPDLOG_LEVEL=info,mylogger=trace && ./example
     spdlog::cfg::load_env_levels();
@@ -161,16 +153,17 @@ void load_levels_example()
 }
 
 #include "spdlog/async.h"
-void async_example()
+void async_example() {
-{
     // Default thread pool settings can be modified *before* creating the async logger:
     // spdlog::init_thread_pool(32768, 1); // queue with max 32k items 1 backing thread.
-    auto async_file = spdlog::basic_logger_mt<spdlog::async_factory>("async_file_logger", "logs/async_log.txt");
+    auto async_file =
+        spdlog::basic_logger_mt<spdlog::async_factory>("async_file_logger", "logs/async_log.txt");
     // alternatively:
-    // auto async_file = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("async_file_logger", "logs/async_log.txt");
+    // auto async_file =
+    // spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("async_file_logger",
+    // "logs/async_log.txt");
 
-    for (int i = 1; i < 101; ++i)
+    for (int i = 1; i < 101; ++i) {
-    {
         async_file->info("Async message #{}", i);
     }
 }
@@ -185,16 +178,15 @@ void async_example()
 // {:n} - don't split the output to lines.
 
 #if !defined SPDLOG_USE_STD_FORMAT || defined(_MSC_VER)
-#include "spdlog/fmt/bin_to_hex.h"
+    #include "spdlog/fmt/bin_to_hex.h"
-void binary_example()
+void binary_example() {
-{
+    std::vector<char> buf;
-    std::vector<char> buf(80);
+    for (int i = 0; i < 80; i++) {
-    for (int i = 0; i < 80; i++)
-    {
         buf.push_back(static_cast<char>(i & 0xff));
     }
     spdlog::info("Binary example: {}", spdlog::to_hex(buf));
-    spdlog::info("Another binary example:{:n}", spdlog::to_hex(std::begin(buf), std::begin(buf) + 10));
+    spdlog::info("Another binary example:{:n}",
+                 spdlog::to_hex(std::begin(buf), std::begin(buf) + 10));
     // more examples:
     // logger->info("uppercase: {:X}", spdlog::to_hex(buf));
     // logger->info("uppercase, no delimiters: {:Xs}", spdlog::to_hex(buf));
@@ -210,9 +202,8 @@ void binary_example() {
 
 // Log a vector of numbers
 #ifndef SPDLOG_USE_STD_FORMAT
-#    include "spdlog/fmt/ranges.h"
+    #include "spdlog/fmt/ranges.h"
-void vector_example()
+void vector_example() {
-{
     std::vector<int> vec = {1, 2, 3};
     spdlog::info("Vector example: {}", vec);
 }
@@ -225,8 +216,7 @@ void vector_example() {}
 
 // Compile time log levels.
 // define SPDLOG_ACTIVE_LEVEL to required level (e.g. SPDLOG_LEVEL_TRACE)
-void trace_example()
+void trace_example() {
-{
     // trace from default logger
     SPDLOG_TRACE("Some trace message.. {} ,{}", 1, 3.23);
     // debug from default logger
@@ -240,16 +230,14 @@ void trace_example()
 // stopwatch example
 #include "spdlog/stopwatch.h"
 #include <thread>
-void stopwatch_example()
+void stopwatch_example() {
-{
     spdlog::stopwatch sw;
     std::this_thread::sleep_for(std::chrono::milliseconds(123));
     spdlog::info("Stopwatch: {} seconds", sw);
 }
 
 #include "spdlog/sinks/udp_sink.h"
-void udp_example()
+void udp_example() {
-{
     spdlog::sinks::udp_sink_config cfg("127.0.0.1", 11091);
     auto my_logger = spdlog::udp_logger_mt("udplog", cfg);
     my_logger->set_level(spdlog::level::debug);
@@ -257,13 +245,13 @@ void udp_example()
 }
 
 // A logger with multiple sinks (stdout and file) - each with a different format and log level.
-void multi_sink_example()
+void multi_sink_example() {
-{
     auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
     console_sink->set_level(spdlog::level::warn);
     console_sink->set_pattern("[multi_sink_example] [%^%l%$] %v");
 
-    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/multisink.txt", true);
+    auto file_sink =
+        std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/multisink.txt", true);
     file_sink->set_level(spdlog::level::trace);
 
     spdlog::logger logger("multi_sink", {console_sink, file_sink});
@@ -273,51 +261,43 @@ void multi_sink_example()
 }
 
 // User defined types logging
-struct my_type
+struct my_type {
-{
     int i = 0;
     explicit my_type(int i)
         : i(i){};
 };
 
-#ifndef SPDLOG_USE_STD_FORMAT // when using fmtlib
+#ifndef SPDLOG_USE_STD_FORMAT  // when using fmtlib
-template<>
+template <>
-struct fmt::formatter<my_type> : fmt::formatter<std::string>
+struct fmt::formatter<my_type> : fmt::formatter<std::string> {
-{
+    auto format(my_type my, format_context &ctx) -> decltype(ctx.out()) {
-    auto format(my_type my, format_context &ctx) -> decltype(ctx.out())
-    {
         return fmt::format_to(ctx.out(), "[my_type i={}]", my.i);
     }
 };
 
-#else // when using std::format
+#else  // when using std::format
-template<>
+template <>
-struct std::formatter<my_type> : std::formatter<std::string>
+struct std::formatter<my_type> : std::formatter<std::string> {
-{
+    auto format(my_type my, format_context &ctx) const -> decltype(ctx.out()) {
-    auto format(my_type my, format_context &ctx) const -> decltype(ctx.out())
-    {
         return format_to(ctx.out(), "[my_type i={}]", my.i);
     }
 };
 #endif
 
-void user_defined_example()
+void user_defined_example() { spdlog::info("user defined type: {}", my_type(14)); }
-{
-    spdlog::info("user defined type: {}", my_type(14));
-}
 
 // Custom error handler. Will be triggered on log failure.
-void err_handler_example()
+void err_handler_example() {
-{
     // can be set globally or per logger(logger->set_error_handler(..))
-    spdlog::set_error_handler([](const std::string &msg) { printf("*** Custom log error handler: %s ***\n", msg.c_str()); });
+    spdlog::set_error_handler([](const std::string &msg) {
+        printf("*** Custom log error handler: %s ***\n", msg.c_str());
+    });
 }
 
 // syslog example (linux/osx/freebsd)
 #ifndef _WIN32
-#    include "spdlog/sinks/syslog_sink.h"
+    #include "spdlog/sinks/syslog_sink.h"
-void syslog_example()
+void syslog_example() {
-{
     std::string ident = "spdlog-example";
     auto syslog_logger = spdlog::syslog_logger_mt("syslog", ident, LOG_PID);
     syslog_logger->warn("This is warning that will end up in syslog.");
@@ -326,9 +306,8 @@ void syslog_example()
 
 // Android example.
 #if defined(__ANDROID__)
-#    include "spdlog/sinks/android_sink.h"
+    #include "spdlog/sinks/android_sink.h"
-void android_example()
+void android_example() {
-{
     std::string tag = "spdlog-android";
     auto android_logger = spdlog::android_logger_mt("android", tag);
     android_logger->critical("Use \"adb shell logcat\" to view this message.");
@@ -338,36 +317,34 @@ void android_example()
 // Log patterns can contain custom flags.
 // this will add custom flag '%*' which will be bound to a <my_formatter_flag> instance
 #include "spdlog/pattern_formatter.h"
-class my_formatter_flag : public spdlog::custom_flag_formatter
+class my_formatter_flag : public spdlog::custom_flag_formatter {
-{
 public:
-    void format(const spdlog::details::log_msg &, const std::tm &, spdlog::memory_buf_t &dest) override
+    void format(const spdlog::details::log_msg &,
-    {
+                const std::tm &,
+                spdlog::memory_buf_t &dest) override {
         std::string some_txt = "custom-flag";
         dest.append(some_txt.data(), some_txt.data() + some_txt.size());
     }
 
-    std::unique_ptr<custom_flag_formatter> clone() const override
+    std::unique_ptr<custom_flag_formatter> clone() const override {
-    {
         return spdlog::details::make_unique<my_formatter_flag>();
     }
 };
 
-void custom_flags_example()
+void custom_flags_example() {
-{
+    using spdlog::details::make_unique;  // for pre c++14
-
-    using spdlog::details::make_unique; // for pre c++14
     auto formatter = make_unique<spdlog::pattern_formatter>();
     formatter->add_flag<my_formatter_flag>('*').set_pattern("[%n] [%*] [%^%l%$] %v");
-    // set the new formatter using spdlog::set_formatter(formatter) or logger->set_formatter(formatter)
+    // set the new formatter using spdlog::set_formatter(formatter) or
-    // spdlog::set_formatter(std::move(formatter));
+    // logger->set_formatter(formatter) spdlog::set_formatter(std::move(formatter));
 }
 
-void file_events_example()
+void file_events_example() {
-{
     // pass the spdlog::file_event_handlers to file sinks for open/close log file notifications
     spdlog::file_event_handlers handlers;
-    handlers.before_open = [](spdlog::filename_t filename) { spdlog::info("Before opening {}", filename); };
+    handlers.before_open = [](spdlog::filename_t filename) {
+        spdlog::info("Before opening {}", filename);
+    };
     handlers.after_open = [](spdlog::filename_t filename, std::FILE *fstream) {
         spdlog::info("After opening {}", filename);
         fputs("After opening\n", fstream);
@@ -376,18 +353,21 @@ void file_events_example()
         spdlog::info("Before closing {}", filename);
         fputs("Before closing\n", fstream);
     };
-    handlers.after_close = [](spdlog::filename_t filename) { spdlog::info("After closing {}", filename); };
+    handlers.after_close = [](spdlog::filename_t filename) {
-    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/events-sample.txt", true, handlers);
+        spdlog::info("After closing {}", filename);
+    };
+    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/events-sample.txt",
+                                                                         true, handlers);
     spdlog::logger my_logger("some_logger", file_sink);
     my_logger.info("Some log line");
 }
 
-void replace_default_logger_example()
+void replace_default_logger_example() {
-{
     // store the old logger so we don't break other examples.
     auto old_logger = spdlog::default_logger();
 
-    auto new_logger = spdlog::basic_logger_mt("new_default_logger", "logs/new-default-log.txt", true);
+    auto new_logger =
+        spdlog::basic_logger_mt("new_default_logger", "logs/new-default-log.txt", true);
     spdlog::set_default_logger(new_logger);
     spdlog::set_level(spdlog::level::info);
     spdlog::debug("This message should not be displayed!");

include/spdlog/async.h

@@ -18,9 +18,9 @@
 #include <spdlog/details/registry.h>
 #include <spdlog/details/thread_pool.h>
 
+#include <functional>
 #include <memory>
 #include <mutex>
-#include <functional>
 
 namespace spdlog {
 
@@ -31,12 +31,10 @@ static const size_t default_async_q_size = 8192;
 // async logger factory - creates async loggers backed with thread pool.
 // if a global thread pool doesn't already exist, create it with default queue
 // size of 8192 items and single thread.
-template<async_overflow_policy OverflowPolicy = async_overflow_policy::block>
+template <async_overflow_policy OverflowPolicy = async_overflow_policy::block>
-struct async_factory_impl
+struct async_factory_impl {
-{
+    template <typename Sink, typename... SinkArgs>
-    template<typename Sink, typename... SinkArgs>
+    static std::shared_ptr<async_logger> create(std::string logger_name, SinkArgs &&...args) {
-    static std::shared_ptr<async_logger> create(std::string logger_name, SinkArgs &&...args)
-    {
         auto &registry_inst = details::registry::instance();
 
         // create global thread pool if not already exists..
@@ -44,14 +42,14 @@ struct async_factory_impl
         auto &mutex = registry_inst.tp_mutex();
         std::lock_guard<std::recursive_mutex> tp_lock(mutex);
         auto tp = registry_inst.get_tp();
-        if (tp == nullptr)
+        if (tp == nullptr) {
-        {
             tp = std::make_shared<details::thread_pool>(details::default_async_q_size, 1U);
             registry_inst.set_tp(tp);
         }
 
         auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
-        auto new_logger = std::make_shared<async_logger>(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy);
+        auto new_logger = std::make_shared<async_logger>(std::move(logger_name), std::move(sink),
+                                                         std::move(tp), OverflowPolicy);
         registry_inst.initialize_logger(new_logger);
         return new_logger;
     }
@@ -60,40 +58,43 @@ struct async_factory_impl
 using async_factory = async_factory_impl<async_overflow_policy::block>;
 using async_factory_nonblock = async_factory_impl<async_overflow_policy::overrun_oldest>;
 
-template<typename Sink, typename... SinkArgs>
+template <typename Sink, typename... SinkArgs>
-inline std::shared_ptr<spdlog::logger> create_async(std::string logger_name, SinkArgs &&...sink_args)
+inline std::shared_ptr<spdlog::logger> create_async(std::string logger_name,
-{
+                                                    SinkArgs &&...sink_args) {
-    return async_factory::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
+    return async_factory::create<Sink>(std::move(logger_name),
+                                       std::forward<SinkArgs>(sink_args)...);
 }
 
-template<typename Sink, typename... SinkArgs>
+template <typename Sink, typename... SinkArgs>
-inline std::shared_ptr<spdlog::logger> create_async_nb(std::string logger_name, SinkArgs &&...sink_args)
+inline std::shared_ptr<spdlog::logger> create_async_nb(std::string logger_name,
-{
+                                                       SinkArgs &&...sink_args) {
-    return async_factory_nonblock::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
+    return async_factory_nonblock::create<Sink>(std::move(logger_name),
+                                                std::forward<SinkArgs>(sink_args)...);
 }
 
 // set global thread pool.
-inline void init_thread_pool(
+inline void init_thread_pool(size_t q_size,
-    size_t q_size, size_t thread_count, std::function<void()> on_thread_start, std::function<void()> on_thread_stop)
+                             size_t thread_count,
-{
+                             std::function<void()> on_thread_start,
-    auto tp = std::make_shared<details::thread_pool>(q_size, thread_count, on_thread_start, on_thread_stop);
+                             std::function<void()> on_thread_stop) {
+    auto tp = std::make_shared<details::thread_pool>(q_size, thread_count, on_thread_start,
+                                                     on_thread_stop);
     details::registry::instance().set_tp(std::move(tp));
 }
 
-inline void init_thread_pool(size_t q_size, size_t thread_count, std::function<void()> on_thread_start)
+inline void init_thread_pool(size_t q_size,
-{
+                             size_t thread_count,
+                             std::function<void()> on_thread_start) {
     init_thread_pool(q_size, thread_count, on_thread_start, [] {});
 }
 
-inline void init_thread_pool(size_t q_size, size_t thread_count)
+inline void init_thread_pool(size_t q_size, size_t thread_count) {
-{
     init_thread_pool(
         q_size, thread_count, [] {}, [] {});
 }
 
 // get the global thread pool.
-inline std::shared_ptr<spdlog::details::thread_pool> thread_pool()
+inline std::shared_ptr<spdlog::details::thread_pool> thread_pool() {
-{
     return details::registry::instance().get_tp();
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/async_logger-inl.h

@@ -4,31 +4,38 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/async_logger.h>
+    #include <spdlog/async_logger.h>
 #endif
 
-#include <spdlog/sinks/sink.h>
 #include <spdlog/details/thread_pool.h>
+#include <spdlog/sinks/sink.h>
 
 #include <memory>
 #include <string>
 
-SPDLOG_INLINE spdlog::async_logger::async_logger(
+SPDLOG_INLINE spdlog::async_logger::async_logger(std::string logger_name,
-    std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+                                                 sinks_init_list sinks_list,
-    : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy)
+                                                 std::weak_ptr<details::thread_pool> tp,
-{}
+                                                 async_overflow_policy overflow_policy)
+    : async_logger(std::move(logger_name),
+                   sinks_list.begin(),
+                   sinks_list.end(),
+                   std::move(tp),
+                   overflow_policy) {}
 
-SPDLOG_INLINE spdlog::async_logger::async_logger(
+SPDLOG_INLINE spdlog::async_logger::async_logger(std::string logger_name,
-    std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+                                                 sink_ptr single_sink,
-    : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy)
+                                                 std::weak_ptr<details::thread_pool> tp,
-{}
+                                                 async_overflow_policy overflow_policy)
+    : async_logger(
+          std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) {}
 
 // send the log message to the thread pool
 SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg){
-    SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){pool_ptr->post_log(shared_from_this(), msg, overflow_policy_);
+    SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){
+        pool_ptr->post_log(shared_from_this(), msg, overflow_policy_);
 }
-else
+else {
-{
     throw_spdlog_ex("async log: thread pool doesn't exist anymore");
 }
 }
@@ -37,10 +44,10 @@ SPDLOG_LOGGER_CATCH(msg.source)
 
 // send flush request to the thread pool
 SPDLOG_INLINE void spdlog::async_logger::flush_(){
-    SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){pool_ptr->post_flush(shared_from_this(), overflow_policy_);
+    SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){
+        pool_ptr->post_flush(shared_from_this(), overflow_policy_);
 }
-else
+else {
-{
     throw_spdlog_ex("async flush: thread pool doesn't exist anymore");
 }
 }
@@ -50,40 +57,27 @@ SPDLOG_LOGGER_CATCH(source_loc())
 //
 // backend functions - called from the thread pool to do the actual job
 //
-SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        if (sink->should_log(msg.level)) {
-    {
+            SPDLOG_TRY { sink->log(msg); }
-        if (sink->should_log(msg.level))
-        {
-            SPDLOG_TRY
-            {
-                sink->log(msg);
-            }
             SPDLOG_LOGGER_CATCH(msg.source)
         }
     }
 
-    if (should_flush_(msg))
+    if (should_flush_(msg)) {
-    {
         backend_flush_();
     }
 }
 
-SPDLOG_INLINE void spdlog::async_logger::backend_flush_()
+SPDLOG_INLINE void spdlog::async_logger::backend_flush_() {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        SPDLOG_TRY { sink->flush(); }
-    {
-        SPDLOG_TRY
-        {
-            sink->flush();
-        }
         SPDLOG_LOGGER_CATCH(source_loc())
     }
 }
 
-SPDLOG_INLINE std::shared_ptr<spdlog::logger> spdlog::async_logger::clone(std::string new_name)
+SPDLOG_INLINE std::shared_ptr<spdlog::logger> spdlog::async_logger::clone(std::string new_name) {
-{
     auto cloned = std::make_shared<spdlog::async_logger>(*this);
     cloned->name_ = std::move(new_name);
     return cloned;

include/spdlog/async_logger.h

@@ -19,35 +19,41 @@
 namespace spdlog {
 
 // Async overflow policy - block by default.
-enum class async_overflow_policy
+enum class async_overflow_policy {
-{
+    block,           // Block until message can be enqueued
-    block,         // Block until message can be enqueued
+    overrun_oldest,  // Discard oldest message in the queue if full when trying to
-    overrun_oldest // Discard oldest message in the queue if full when trying to
+                     // add new item.
-                   // add new item.
+    discard_new      // Discard new message if the queue is full when trying to add new item.
 };
 
 namespace details {
 class thread_pool;
 }
 
-class SPDLOG_API async_logger final : public std::enable_shared_from_this<async_logger>, public logger
+class SPDLOG_API async_logger final : public std::enable_shared_from_this<async_logger>,
-{
+                                      public logger {
     friend class details::thread_pool;
 
 public:
-    template<typename It>
+    template <typename It>
-    async_logger(std::string logger_name, It begin, It end, std::weak_ptr<details::thread_pool> tp,
+    async_logger(std::string logger_name,
-        async_overflow_policy overflow_policy = async_overflow_policy::block)
+                 It begin,
-        : logger(std::move(logger_name), begin, end)
+                 It end,
-        , thread_pool_(std::move(tp))
+                 std::weak_ptr<details::thread_pool> tp,
-        , overflow_policy_(overflow_policy)
+                 async_overflow_policy overflow_policy = async_overflow_policy::block)
-    {}
+        : logger(std::move(logger_name), begin, end),
+          thread_pool_(std::move(tp)),
+          overflow_policy_(overflow_policy) {}
 
-    async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp,
+    async_logger(std::string logger_name,
-        async_overflow_policy overflow_policy = async_overflow_policy::block);
+                 sinks_init_list sinks_list,
+                 std::weak_ptr<details::thread_pool> tp,
+                 async_overflow_policy overflow_policy = async_overflow_policy::block);
 
-    async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp,
+    async_logger(std::string logger_name,
-        async_overflow_policy overflow_policy = async_overflow_policy::block);
+                 sink_ptr single_sink,
+                 std::weak_ptr<details::thread_pool> tp,
+                 async_overflow_policy overflow_policy = async_overflow_policy::block);
 
     std::shared_ptr<logger> clone(std::string new_name) override;
 
@@ -61,8 +67,8 @@ private:
     std::weak_ptr<details::thread_pool> thread_pool_;
     async_overflow_policy overflow_policy_;
 };
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "async_logger-inl.h"
+    #include "async_logger-inl.h"
 #endif

include/spdlog/cfg/argv.h

@@ -21,24 +21,20 @@ namespace spdlog {
 namespace cfg {
 
 // search for SPDLOG_LEVEL= in the args and use it to init the levels
-inline void load_argv_levels(int argc, const char **argv)
+inline void load_argv_levels(int argc, const char **argv) {
-{
     const std::string spdlog_level_prefix = "SPDLOG_LEVEL=";
-    for (int i = 1; i < argc; i++)
+    for (int i = 1; i < argc; i++) {
-    {
         std::string arg = argv[i];
-        if (arg.find(spdlog_level_prefix) == 0)
+        if (arg.find(spdlog_level_prefix) == 0) {
-        {
             auto levels_string = arg.substr(spdlog_level_prefix.size());
             helpers::load_levels(levels_string);
         }
     }
 }
 
-inline void load_argv_levels(int argc, char **argv)
+inline void load_argv_levels(int argc, char **argv) {
-{
     load_argv_levels(argc, const_cast<const char **>(argv));
 }
 
-} // namespace cfg
+}  // namespace cfg
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/cfg/env.h

@@ -3,8 +3,8 @@
 
 #pragma once
 #include <spdlog/cfg/helpers.h>
-#include <spdlog/details/registry.h>
 #include <spdlog/details/os.h>
+#include <spdlog/details/registry.h>
 
 //
 // Init levels and patterns from env variables SPDLOG_LEVEL
@@ -25,14 +25,12 @@
 
 namespace spdlog {
 namespace cfg {
-inline void load_env_levels()
+inline void load_env_levels() {
-{
     auto env_val = details::os::getenv("SPDLOG_LEVEL");
-    if (!env_val.empty())
+    if (!env_val.empty()) {
-    {
         helpers::load_levels(env_val);
     }
 }
 
-} // namespace cfg
+}  // namespace cfg
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/cfg/helpers-inl.h

@@ -4,33 +4,32 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/cfg/helpers.h>
+    #include <spdlog/cfg/helpers.h>
 #endif
 
-#include <spdlog/spdlog.h>
 #include <spdlog/details/os.h>
 #include <spdlog/details/registry.h>
+#include <spdlog/spdlog.h>
 
 #include <algorithm>
+#include <sstream>
 #include <string>
 #include <utility>
-#include <sstream>
 
 namespace spdlog {
 namespace cfg {
 namespace helpers {
 
 // inplace convert to lowercase
-inline std::string &to_lower_(std::string &str)
+inline std::string &to_lower_(std::string &str) {
-{
+    std::transform(str.begin(), str.end(), str.begin(), [](char ch) {
-    std::transform(
+        return static_cast<char>((ch >= 'A' && ch <= 'Z') ? ch + ('a' - 'A') : ch);
-        str.begin(), str.end(), str.begin(), [](char ch) { return static_cast<char>((ch >= 'A' && ch <= 'Z') ? ch + ('a' - 'A') : ch); });
+    });
     return str;
 }
 
 // inplace trim spaces
-inline std::string &trim_(std::string &str)
+inline std::string &trim_(std::string &str) {
-{
     const char *spaces = " \n\r\t";
     str.erase(str.find_last_not_of(spaces) + 1);
     str.erase(0, str.find_first_not_of(spaces));
@@ -44,16 +43,12 @@ inline std::string &trim_(std::string &str)
 // "key=" => ("key", "")
 // "val" => ("", "val")
 
-inline std::pair<std::string, std::string> extract_kv_(char sep, const std::string &str)
+inline std::pair<std::string, std::string> extract_kv_(char sep, const std::string &str) {
-{
     auto n = str.find(sep);
     std::string k, v;
-    if (n == std::string::npos)
+    if (n == std::string::npos) {
-    {
         v = str;
-    }
+    } else {
-    else
-    {
         k = str.substr(0, n);
         v = str.substr(n + 1);
     }
@@ -62,15 +57,12 @@ inline std::pair<std::string, std::string> extract_kv_(char sep, const std::stri
 
 // return vector of key/value pairs from sequence of "K1=V1,K2=V2,.."
 // "a=AAA,b=BBB,c=CCC,.." => {("a","AAA"),("b","BBB"),("c", "CCC"),...}
-inline std::unordered_map<std::string, std::string> extract_key_vals_(const std::string &str)
+inline std::unordered_map<std::string, std::string> extract_key_vals_(const std::string &str) {
-{
     std::string token;
     std::istringstream token_stream(str);
     std::unordered_map<std::string, std::string> rv{};
-    while (std::getline(token_stream, token, ','))
+    while (std::getline(token_stream, token, ',')) {
-    {
+        if (token.empty()) {
-        if (token.empty())
-        {
             continue;
         }
         auto kv = extract_kv_('=', token);
@@ -79,10 +71,8 @@ inline std::unordered_map<std::string, std::string> extract_key_vals_(const std:
     return rv;
 }
 
-SPDLOG_INLINE void load_levels(const std::string &input)
+SPDLOG_INLINE void load_levels(const std::string &input) {
-{
+    if (input.empty() || input.size() > 512) {
-    if (input.empty() || input.size() > 512)
-    {
         return;
     }
 
@@ -91,30 +81,27 @@ SPDLOG_INLINE void load_levels(const std::string &input)
     level::level_enum global_level = level::info;
     bool global_level_found = false;
 
-    for (auto &name_level : key_vals)
+    for (auto &name_level : key_vals) {
-    {
         auto &logger_name = name_level.first;
         auto level_name = to_lower_(name_level.second);
         auto level = level::from_str(level_name);
         // ignore unrecognized level names
-        if (level == level::off && level_name != "off")
+        if (level == level::off && level_name != "off") {
-        {
             continue;
         }
-        if (logger_name.empty()) // no logger name indicate global level
+        if (logger_name.empty())  // no logger name indicate global level
         {
             global_level_found = true;
             global_level = level;
-        }
+        } else {
-        else
-        {
             levels[logger_name] = level;
         }
     }
 
-    details::registry::instance().set_levels(std::move(levels), global_level_found ? &global_level : nullptr);
+    details::registry::instance().set_levels(std::move(levels),
+                                             global_level_found ? &global_level : nullptr);
 }
 
-} // namespace helpers
+}  // namespace helpers
-} // namespace cfg
+}  // namespace cfg
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/cfg/helpers.h

@@ -19,11 +19,11 @@ namespace helpers {
 // turn off all logging except for logger1 and logger2: "off,logger1=debug,logger2=info"
 //
 SPDLOG_API void load_levels(const std::string &txt);
-} // namespace helpers
+}  // namespace helpers
 
-} // namespace cfg
+}  // namespace cfg
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "helpers-inl.h"
+    #include "helpers-inl.h"
-#endif // SPDLOG_HEADER_ONLY
+#endif  // SPDLOG_HEADER_ONLY

include/spdlog/common-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/common.h>
+    #include <spdlog/common.h>
 #endif
 
 #include <algorithm>
@@ -20,41 +20,34 @@ constexpr
 
 static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES;
 
-SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
+SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT {
-{
     return level_string_views[l];
 }
 
-SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
+SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT {
-{
     return short_level_names[l];
 }
 
-SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT
+SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT {
-{
     auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name);
     if (it != std::end(level_string_views))
         return static_cast<level::level_enum>(std::distance(std::begin(level_string_views), it));
 
     // check also for "warn" and "err" before giving up..
-    if (name == "warn")
+    if (name == "warn") {
-    {
         return level::warn;
     }
-    if (name == "err")
+    if (name == "err") {
-    {
         return level::err;
     }
     return level::off;
 }
-} // namespace level
+}  // namespace level
 
 SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg)
-    : msg_(std::move(msg))
+    : msg_(std::move(msg)) {}
-{}
 
-SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
+SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) {
-{
 #ifdef SPDLOG_USE_STD_FORMAT
     msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what();
 #else
@@ -64,19 +57,12 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
 #endif
 }
 
-SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT
+SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT { return msg_.c_str(); }
-{
-    return msg_.c_str();
-}
 
-SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno)
+SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) {
-{
     SPDLOG_THROW(spdlog_ex(msg, last_errno));
 }
 
-SPDLOG_INLINE void throw_spdlog_ex(std::string msg)
+SPDLOG_INLINE void throw_spdlog_ex(std::string msg) { SPDLOG_THROW(spdlog_ex(std::move(msg))); }
-{
-    SPDLOG_THROW(spdlog_ex(std::move(msg)));
-}
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/common.h

@@ -3,112 +3,121 @@
 
 #pragma once
 
-#include <spdlog/tweakme.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/tweakme.h>
 
 #include <atomic>
 #include <chrono>
+#include <cstdio>
+#include <exception>
+#include <functional>
 #include <initializer_list>
 #include <memory>
-#include <exception>
 #include <string>
 #include <type_traits>
-#include <functional>
-#include <cstdio>
 
 #ifdef SPDLOG_USE_STD_FORMAT
-#    include <version>
+    #include <version>
-#    if __cpp_lib_format >= 202207L
+    #if __cpp_lib_format >= 202207L
-#        include <format>
+        #include <format>
-#    else
+    #else
-#        include <string_view>
+        #include <string_view>
-#    endif
+    #endif
 #endif
 
 #ifdef SPDLOG_COMPILED_LIB
-#    undef SPDLOG_HEADER_ONLY
+    #undef SPDLOG_HEADER_ONLY
-#    if defined(SPDLOG_SHARED_LIB)
+    #if defined(SPDLOG_SHARED_LIB)
-#        if defined(_WIN32)
+        #if defined(_WIN32)
-#            ifdef spdlog_EXPORTS
+            #ifdef spdlog_EXPORTS
-#                define SPDLOG_API __declspec(dllexport)
+                #define SPDLOG_API __declspec(dllexport)
-#            else // !spdlog_EXPORTS
+            #else  // !spdlog_EXPORTS
-#                define SPDLOG_API __declspec(dllimport)
+                #define SPDLOG_API __declspec(dllimport)
-#            endif
+            #endif
-#        else // !defined(_WIN32)
+        #else  // !defined(_WIN32)
-#            define SPDLOG_API __attribute__((visibility("default")))
+            #define SPDLOG_API __attribute__((visibility("default")))
-#        endif
+        #endif
-#    else // !defined(SPDLOG_SHARED_LIB)
+    #else  // !defined(SPDLOG_SHARED_LIB)
-#        define SPDLOG_API
+        #define SPDLOG_API
-#    endif
+    #endif
-#    define SPDLOG_INLINE
+    #define SPDLOG_INLINE
-#else // !defined(SPDLOG_COMPILED_LIB)
+#else  // !defined(SPDLOG_COMPILED_LIB)
-#    define SPDLOG_API
+    #define SPDLOG_API
-#    define SPDLOG_HEADER_ONLY
+    #define SPDLOG_HEADER_ONLY
-#    define SPDLOG_INLINE inline
+    #define SPDLOG_INLINE inline
-#endif // #ifdef SPDLOG_COMPILED_LIB
+#endif  // #ifdef SPDLOG_COMPILED_LIB
 
 #include <spdlog/fmt/fmt.h>
 
-#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8
+#if !defined(SPDLOG_USE_STD_FORMAT) && \
-#    define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string)
+    FMT_VERSION >= 80000  // backward compatibility with fmt versions older than 8
-#    define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string)
+    #define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string)
-#    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string)
-#        include <spdlog/fmt/xchar.h>
+    #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-#    endif
+        #include <spdlog/fmt/xchar.h>
+    #endif
 #else
-#    define SPDLOG_FMT_RUNTIME(format_string) format_string
+    #define SPDLOG_FMT_RUNTIME(format_string) format_string
-#    define SPDLOG_FMT_STRING(format_string) format_string
+    #define SPDLOG_FMT_STRING(format_string) format_string
 #endif
 
 // visual studio up to 2013 does not support noexcept nor constexpr
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
-#    define SPDLOG_NOEXCEPT _NOEXCEPT
+    #define SPDLOG_NOEXCEPT _NOEXCEPT
-#    define SPDLOG_CONSTEXPR
+    #define SPDLOG_CONSTEXPR
-#    define SPDLOG_CONSTEXPR_FUNC inline
 #else
-#    define SPDLOG_NOEXCEPT noexcept
+    #define SPDLOG_NOEXCEPT noexcept
-#    define SPDLOG_CONSTEXPR constexpr
+    #define SPDLOG_CONSTEXPR constexpr
-#    if __cplusplus >= 201402L
+#endif
-#        define SPDLOG_CONSTEXPR_FUNC constexpr
+
-#    else
+// If building with std::format, can just use constexpr, otherwise if building with fmt
-#        define SPDLOG_CONSTEXPR_FUNC inline
+// SPDLOG_CONSTEXPR_FUNC needs to be set the same as FMT_CONSTEXPR to avoid situations where
-#    endif
+// a constexpr function in spdlog could end up calling a non-constexpr function in fmt
+// depending on the compiler
+// If fmt determines it can't use constexpr, we should inline the function instead
+#ifdef SPDLOG_USE_STD_FORMAT
+    #define SPDLOG_CONSTEXPR_FUNC constexpr
+#else  // Being built with fmt
+    #if FMT_USE_CONSTEXPR
+        #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR
+    #else
+	#define SPDLOG_CONSTEXPR_FUNC inline
+    #endif
 #endif
 
 #if defined(__GNUC__) || defined(__clang__)
-#    define SPDLOG_DEPRECATED __attribute__((deprecated))
+    #define SPDLOG_DEPRECATED __attribute__((deprecated))
 #elif defined(_MSC_VER)
-#    define SPDLOG_DEPRECATED __declspec(deprecated)
+    #define SPDLOG_DEPRECATED __declspec(deprecated)
 #else
-#    define SPDLOG_DEPRECATED
+    #define SPDLOG_DEPRECATED
 #endif
 
 // disable thread local on msvc 2013
 #ifndef SPDLOG_NO_TLS
-#    if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt)
+    #if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt)
-#        define SPDLOG_NO_TLS 1
+        #define SPDLOG_NO_TLS 1
-#    endif
+    #endif
 #endif
 
 #ifndef SPDLOG_FUNCTION
-#    define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
+    #define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
 #endif
 
 #ifdef SPDLOG_NO_EXCEPTIONS
-#    define SPDLOG_TRY
+    #define SPDLOG_TRY
-#    define SPDLOG_THROW(ex)                                                                                                               \
+    #define SPDLOG_THROW(ex)                               \
-        do                                                                                                                                 \
+        do {                                               \
-        {                                                                                                                                  \
+            printf("spdlog fatal error: %s\n", ex.what()); \
-            printf("spdlog fatal error: %s\n", ex.what());                                                                                 \
+            std::abort();                                  \
-            std::abort();                                                                                                                  \
         } while (0)
-#    define SPDLOG_CATCH_STD
+    #define SPDLOG_CATCH_STD
 #else
-#    define SPDLOG_TRY try
+    #define SPDLOG_TRY try
-#    define SPDLOG_THROW(ex) throw(ex)
+    #define SPDLOG_THROW(ex) throw(ex)
-#    define SPDLOG_CATCH_STD                                                                                                               \
+    #define SPDLOG_CATCH_STD             \
-        catch (const std::exception &)                                                                                                     \
+        catch (const std::exception &) { \
-        {}
+        }
 #endif
 
 namespace spdlog {
@@ -121,12 +130,12 @@ class sink;
 
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
 using filename_t = std::wstring;
-// allow macro expansion to occur in SPDLOG_FILENAME_T
+    // allow macro expansion to occur in SPDLOG_FILENAME_T
-#    define SPDLOG_FILENAME_T_INNER(s) L##s
+    #define SPDLOG_FILENAME_T_INNER(s) L##s
-#    define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s)
+    #define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s)
 #else
 using filename_t = std::string;
-#    define SPDLOG_FILENAME_T(s) s
+    #define SPDLOG_FILENAME_T(s) s
 #endif
 
 using log_clock = std::chrono::system_clock;
@@ -139,76 +148,79 @@ namespace fmt_lib = std;
 using string_view_t = std::string_view;
 using memory_buf_t = std::string;
 
-template<typename... Args>
+template <typename... Args>
-#    if __cpp_lib_format >= 202207L
+    #if __cpp_lib_format >= 202207L
 using format_string_t = std::format_string<Args...>;
-#    else
+    #else
 using format_string_t = std::string_view;
-#    endif
+    #endif
 
-template<class T, class Char = char>
+template <class T, class Char = char>
-struct is_convertible_to_basic_format_string : std::integral_constant<bool, std::is_convertible<T, std::basic_string_view<Char>>::value>
+struct is_convertible_to_basic_format_string
-{};
+    : std::integral_constant<bool, std::is_convertible<T, std::basic_string_view<Char>>::value> {};
 
-#    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 using wstring_view_t = std::wstring_view;
 using wmemory_buf_t = std::wstring;
 
-template<typename... Args>
+template <typename... Args>
-#        if __cpp_lib_format >= 202207L
+        #if __cpp_lib_format >= 202207L
 using wformat_string_t = std::wformat_string<Args...>;
-#        else
+        #else
 using wformat_string_t = std::wstring_view;
-#        endif
+        #endif
-#    endif
+    #endif
-#    define SPDLOG_BUF_TO_STRING(x) x
+    #define SPDLOG_BUF_TO_STRING(x) x
-#else // use fmt lib instead of std::format
+#else  // use fmt lib instead of std::format
 namespace fmt_lib = fmt;
 
 using string_view_t = fmt::basic_string_view<char>;
 using memory_buf_t = fmt::basic_memory_buffer<char, 250>;
 
-template<typename... Args>
+template <typename... Args>
 using format_string_t = fmt::format_string<Args...>;
 
-template<class T>
+template <class T>
 using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
 
-template<typename Char>
+template <typename Char>
-#    if FMT_VERSION >= 90101
+    #if FMT_VERSION >= 90101
 using fmt_runtime_string = fmt::runtime_format_string<Char>;
-#    else
+    #else
 using fmt_runtime_string = fmt::basic_runtime<Char>;
-#    endif
+    #endif
 
-// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
+// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the
-// in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
+// condition from basic_format_string here, in addition, fmt::basic_runtime<Char> is only
-template<class T, class Char = char>
+// convertible to basic_format_string<Char> but not basic_string_view<Char>
+template <class T, class Char = char>
 struct is_convertible_to_basic_format_string
     : std::integral_constant<bool,
-          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
+                             std::is_convertible<T, fmt::basic_string_view<Char>>::value ||
-{};
+                                 std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value> {
+};
 
-#    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 using wstring_view_t = fmt::basic_string_view<wchar_t>;
 using wmemory_buf_t = fmt::basic_memory_buffer<wchar_t, 250>;
 
-template<typename... Args>
+template <typename... Args>
 using wformat_string_t = fmt::wformat_string<Args...>;
-#    endif
+    #endif
-#    define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x)
+    #define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x)
 #endif
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-#    ifndef _WIN32
+    #ifndef _WIN32
-#        error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
+        #error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
-#    endif // _WIN32
+    #endif  // _WIN32
-#endif     // SPDLOG_WCHAR_TO_UTF8_SUPPORT
+#endif      // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
-template<class T>
+template <class T>
-struct is_convertible_to_any_format_string : std::integral_constant<bool, is_convertible_to_basic_format_string<T, char>::value ||
+struct is_convertible_to_any_format_string
-                                                                              is_convertible_to_basic_format_string<T, wchar_t>::value>
+    : std::integral_constant<bool,
-{};
+                             is_convertible_to_basic_format_string<T, char>::value ||
+                                 is_convertible_to_basic_format_string<T, wchar_t>::value> {};
 
 #if defined(SPDLOG_NO_ATOMIC_LEVELS)
 using level_t = details::null_atomic_int;
@@ -225,13 +237,12 @@ using level_t = std::atomic<int>;
 #define SPDLOG_LEVEL_OFF 6
 
 #if !defined(SPDLOG_ACTIVE_LEVEL)
-#    define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
+    #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
 #endif
 
 // Log level enum
 namespace level {
-enum level_enum : int
+enum level_enum : int {
-{
     trace = SPDLOG_LEVEL_TRACE,
     debug = SPDLOG_LEVEL_DEBUG,
     info = SPDLOG_LEVEL_INFO,
@@ -251,52 +262,44 @@ enum level_enum : int
 #define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3)
 
 #if !defined(SPDLOG_LEVEL_NAMES)
-#    define SPDLOG_LEVEL_NAMES                                                                                                             \
+    #define SPDLOG_LEVEL_NAMES                                                                  \
-        {                                                                                                                                  \
+        {                                                                                       \
-            SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR,  \
+            SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO,           \
-                SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF                                                                          \
+                SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, SPDLOG_LEVEL_NAME_CRITICAL, \
+                SPDLOG_LEVEL_NAME_OFF                                                           \
         }
 #endif
 
 #if !defined(SPDLOG_SHORT_LEVEL_NAMES)
 
-#    define SPDLOG_SHORT_LEVEL_NAMES                                                                                                       \
+    #define SPDLOG_SHORT_LEVEL_NAMES \
-        {                                                                                                                                  \
+        { "T", "D", "I", "W", "E", "C", "O" }
-            "T", "D", "I", "W", "E", "C", "O"                                                                                              \
-        }
 #endif
 
 SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
 SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
 SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT;
 
-} // namespace level
+}  // namespace level
 
 //
 // Color mode used by sinks with color support.
 //
-enum class color_mode
+enum class color_mode { always, automatic, never };
-{
-    always,
-    automatic,
-    never
-};
 
 //
 // Pattern time - specific time getting to use for pattern_formatter.
 // local time by default
 //
-enum class pattern_time_type
+enum class pattern_time_type {
-{
+    local,  // log localtime
-    local, // log localtime
+    utc     // log utc
-    utc    // log utc
 };
 
 //
 // Log exception
 //
-class SPDLOG_API spdlog_ex : public std::exception
+class SPDLOG_API spdlog_ex : public std::exception {
-{
 public:
     explicit spdlog_ex(std::string msg);
     spdlog_ex(const std::string &msg, int last_errno);
@@ -309,32 +312,25 @@ private:
 [[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno);
 [[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg);
 
-struct source_loc
+struct source_loc {
-{
     SPDLOG_CONSTEXPR source_loc() = default;
     SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in)
-        : filename{filename_in}
+        : filename{filename_in},
-        , line{line_in}
+          line{line_in},
-        , funcname{funcname_in}
+          funcname{funcname_in} {}
-    {}
 
-    SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT
+    SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT { return line == 0; }
-    {
-        return line == 0;
-    }
     const char *filename{nullptr};
     int line{0};
     const char *funcname{nullptr};
 };
 
-struct file_event_handlers
+struct file_event_handlers {
-{
     file_event_handlers()
-        : before_open(nullptr)
+        : before_open(nullptr),
-        , after_open(nullptr)
+          after_open(nullptr),
-        , before_close(nullptr)
+          before_close(nullptr),
-        , after_close(nullptr)
+          after_close(nullptr) {}
-    {}
 
     std::function<void(const filename_t &filename)> before_open;
     std::function<void(const filename_t &filename, std::FILE *file_stream)> after_open;
@@ -346,75 +342,70 @@ namespace details {
 
 // to_string_view
 
-SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT
+SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf)
-{
+    SPDLOG_NOEXCEPT {
     return spdlog::string_view_t{buf.data(), buf.size()};
 }
 
-SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT
+SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str)
-{
+    SPDLOG_NOEXCEPT {
     return str;
 }
 
 #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT
+SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf)
-{
+    SPDLOG_NOEXCEPT {
     return spdlog::wstring_view_t{buf.data(), buf.size()};
 }
 
-SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT
+SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str)
-{
+    SPDLOG_NOEXCEPT {
     return str;
 }
 #endif
 
 #ifndef SPDLOG_USE_STD_FORMAT
-template<typename T, typename... Args>
+template <typename T, typename... Args>
-inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt)
+inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
-{
     return fmt;
 }
 #elif __cpp_lib_format >= 202207L
-template<typename T, typename... Args>
+template <typename T, typename... Args>
-SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT
+SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
-{
+    std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {
     return fmt.get();
 }
 #endif
 
 // make_unique support for pre c++14
-
+#if __cplusplus >= 201402L  // C++14 and beyond
-#if __cplusplus >= 201402L // C++14 and beyond
 using std::enable_if_t;
 using std::make_unique;
 #else
-template<bool B, class T = void>
+template <bool B, class T = void>
 using enable_if_t = typename std::enable_if<B, T>::type;
 
-template<typename T, typename... Args>
+template <typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args &&...args)
+std::unique_ptr<T> make_unique(Args &&...args) {
-{
     static_assert(!std::is_array<T>::value, "arrays not supported");
     return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }
 #endif
 
 // to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
-template<typename T, typename U, enable_if_t<!std::is_same<T, U>::value, int> = 0>
+template <typename T, typename U, enable_if_t<!std::is_same<T, U>::value, int> = 0>
-constexpr T conditional_static_cast(U value)
+constexpr T conditional_static_cast(U value) {
-{
     return static_cast<T>(value);
 }
 
-template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+template <typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
-constexpr T conditional_static_cast(U value)
+constexpr T conditional_static_cast(U value) {
-{
     return value;
 }
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "common-inl.h"
+    #include "common-inl.h"
 #endif

include/spdlog/details/backtracer-inl.h

@@ -4,72 +4,60 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/backtracer.h>
+    #include <spdlog/details/backtracer.h>
 #endif
 namespace spdlog {
 namespace details {
-SPDLOG_INLINE backtracer::backtracer(const backtracer &other)
+SPDLOG_INLINE backtracer::backtracer(const backtracer &other) {
-{
     std::lock_guard<std::mutex> lock(other.mutex_);
     enabled_ = other.enabled();
     messages_ = other.messages_;
 }
 
-SPDLOG_INLINE backtracer::backtracer(backtracer &&other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE backtracer::backtracer(backtracer &&other) SPDLOG_NOEXCEPT {
-{
     std::lock_guard<std::mutex> lock(other.mutex_);
     enabled_ = other.enabled();
     messages_ = std::move(other.messages_);
 }
 
-SPDLOG_INLINE backtracer &backtracer::operator=(backtracer other)
+SPDLOG_INLINE backtracer &backtracer::operator=(backtracer other) {
-{
     std::lock_guard<std::mutex> lock(mutex_);
     enabled_ = other.enabled();
     messages_ = std::move(other.messages_);
     return *this;
 }
 
-SPDLOG_INLINE void backtracer::enable(size_t size)
+SPDLOG_INLINE void backtracer::enable(size_t size) {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     enabled_.store(true, std::memory_order_relaxed);
     messages_ = circular_q<log_msg_buffer>{size};
 }
 
-SPDLOG_INLINE void backtracer::disable()
+SPDLOG_INLINE void backtracer::disable() {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     enabled_.store(false, std::memory_order_relaxed);
 }
 
-SPDLOG_INLINE bool backtracer::enabled() const
+SPDLOG_INLINE bool backtracer::enabled() const { return enabled_.load(std::memory_order_relaxed); }
-{
-    return enabled_.load(std::memory_order_relaxed);
-}
 
-SPDLOG_INLINE void backtracer::push_back(const log_msg &msg)
+SPDLOG_INLINE void backtracer::push_back(const log_msg &msg) {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     messages_.push_back(log_msg_buffer{msg});
 }
 
-SPDLOG_INLINE bool backtracer::empty() const
+SPDLOG_INLINE bool backtracer::empty() const {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     return messages_.empty();
 }
 
 // pop all items in the q and apply the given fun on each of them.
-SPDLOG_INLINE void backtracer::foreach_pop(std::function<void(const details::log_msg &)> fun)
+SPDLOG_INLINE void backtracer::foreach_pop(std::function<void(const details::log_msg &)> fun) {
-{
     std::lock_guard<std::mutex> lock{mutex_};
-    while (!messages_.empty())
+    while (!messages_.empty()) {
-    {
         auto &front_msg = messages_.front();
         fun(front_msg);
         messages_.pop_front();
     }
 }
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/backtracer.h

@@ -3,20 +3,19 @@
 
 #pragma once
 
-#include <spdlog/details/log_msg_buffer.h>
 #include <spdlog/details/circular_q.h>
+#include <spdlog/details/log_msg_buffer.h>
 
 #include <atomic>
-#include <mutex>
 #include <functional>
+#include <mutex>
 
 // Store log messages in circular buffer.
 // Useful for storing debug data in case of error/warning happens.
 
 namespace spdlog {
 namespace details {
-class SPDLOG_API backtracer
+class SPDLOG_API backtracer {
-{
     mutable std::mutex mutex_;
     std::atomic<bool> enabled_{false};
     circular_q<log_msg_buffer> messages_;
@@ -38,9 +37,9 @@ public:
     void foreach_pop(std::function<void(const details::log_msg &)> fun);
 };
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "backtracer-inl.h"
+    #include "backtracer-inl.h"
 #endif

include/spdlog/details/circular_q.h

@@ -4,14 +4,13 @@
 // circular q view of std::vector.
 #pragma once
 
-#include <vector>
 #include <cassert>
+#include <vector>
 
 namespace spdlog {
 namespace details {
-template<typename T>
+template <typename T>
-class circular_q
+class circular_q {
-{
     size_t max_items_ = 0;
     typename std::vector<T>::size_type head_ = 0;
     typename std::vector<T>::size_type tail_ = 0;
@@ -25,35 +24,29 @@ public:
     circular_q() = default;
 
     explicit circular_q(size_t max_items)
-        : max_items_(max_items + 1) // one item is reserved as marker for full q
+        : max_items_(max_items + 1)  // one item is reserved as marker for full q
-        , v_(max_items_)
+          ,
-    {}
+          v_(max_items_) {}
 
     circular_q(const circular_q &) = default;
     circular_q &operator=(const circular_q &) = default;
 
     // move cannot be default,
     // since we need to reset head_, tail_, etc to zero in the moved object
-    circular_q(circular_q &&other) SPDLOG_NOEXCEPT
+    circular_q(circular_q &&other) SPDLOG_NOEXCEPT { copy_moveable(std::move(other)); }
-    {
-        copy_moveable(std::move(other));
-    }
 
-    circular_q &operator=(circular_q &&other) SPDLOG_NOEXCEPT
+    circular_q &operator=(circular_q &&other) SPDLOG_NOEXCEPT {
-    {
         copy_moveable(std::move(other));
         return *this;
     }
 
     // push back, overrun (oldest) item if no room left
-    void push_back(T &&item)
+    void push_back(T &&item) {
-    {
+        if (max_items_ > 0) {
-        if (max_items_ > 0)
-        {
             v_[tail_] = std::move(item);
             tail_ = (tail_ + 1) % max_items_;
 
-            if (tail_ == head_) // overrun last item if full
+            if (tail_ == head_)  // overrun last item if full
             {
                 head_ = (head_ + 1) % max_items_;
                 ++overrun_counter_;
@@ -63,73 +56,47 @@ public:
 
     // Return reference to the front item.
     // If there are no elements in the container, the behavior is undefined.
-    const T &front() const
+    const T &front() const { return v_[head_]; }
-    {
-        return v_[head_];
-    }
 
-    T &front()
+    T &front() { return v_[head_]; }
-    {
-        return v_[head_];
-    }
 
     // Return number of elements actually stored
-    size_t size() const
+    size_t size() const {
-    {
+        if (tail_ >= head_) {
-        if (tail_ >= head_)
-        {
             return tail_ - head_;
-        }
+        } else {
-        else
-        {
             return max_items_ - (head_ - tail_);
         }
     }
 
     // Return const reference to item by index.
     // If index is out of range 0…size()-1, the behavior is undefined.
-    const T &at(size_t i) const
+    const T &at(size_t i) const {
-    {
         assert(i < size());
         return v_[(head_ + i) % max_items_];
     }
 
     // Pop item from front.
     // If there are no elements in the container, the behavior is undefined.
-    void pop_front()
+    void pop_front() { head_ = (head_ + 1) % max_items_; }
-    {
-        head_ = (head_ + 1) % max_items_;
-    }
 
-    bool empty() const
+    bool empty() const { return tail_ == head_; }
-    {
-        return tail_ == head_;
-    }
 
-    bool full() const
+    bool full() const {
-    {
         // head is ahead of the tail by 1
-        if (max_items_ > 0)
+        if (max_items_ > 0) {
-        {
             return ((tail_ + 1) % max_items_) == head_;
         }
         return false;
     }
 
-    size_t overrun_counter() const
+    size_t overrun_counter() const { return overrun_counter_; }
-    {
-        return overrun_counter_;
-    }
 
-    void reset_overrun_counter()
+    void reset_overrun_counter() { overrun_counter_ = 0; }
-    {
-        overrun_counter_ = 0;
-    }
 
 private:
     // copy from other&& and reset it to disabled state
-    void copy_moveable(circular_q &&other) SPDLOG_NOEXCEPT
+    void copy_moveable(circular_q &&other) SPDLOG_NOEXCEPT {
-    {
         max_items_ = other.max_items_;
         head_ = other.head_;
         tail_ = other.tail_;
@@ -142,5 +109,5 @@ private:
         other.overrun_counter_ = 0;
     }
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/console_globals.h

@@ -3,30 +3,26 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
 #include <mutex>
+#include <spdlog/details/null_mutex.h>
 
 namespace spdlog {
 namespace details {
 
-struct console_mutex
+struct console_mutex {
-{
     using mutex_t = std::mutex;
-    static mutex_t &mutex()
+    static mutex_t &mutex() {
-    {
         static mutex_t s_mutex;
         return s_mutex;
     }
 };
 
-struct console_nullmutex
+struct console_nullmutex {
-{
     using mutex_t = null_mutex;
-    static mutex_t &mutex()
+    static mutex_t &mutex() {
-    {
         static mutex_t s_mutex;
         return s_mutex;
     }
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/file_helper-inl.h

@@ -4,11 +4,11 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/file_helper.h>
+    #include <spdlog/details/file_helper.h>
 #endif
 
-#include <spdlog/details/os.h>
 #include <spdlog/common.h>
+#include <spdlog/details/os.h>
 
 #include <cerrno>
 #include <chrono>
@@ -21,47 +21,36 @@ namespace spdlog {
 namespace details {
 
 SPDLOG_INLINE file_helper::file_helper(const file_event_handlers &event_handlers)
-    : event_handlers_(event_handlers)
+    : event_handlers_(event_handlers) {}
-{}
 
-SPDLOG_INLINE file_helper::~file_helper()
+SPDLOG_INLINE file_helper::~file_helper() { close(); }
-{
-    close();
-}
 
-SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
+SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate) {
-{
     close();
     filename_ = fname;
 
     auto *mode = SPDLOG_FILENAME_T("ab");
     auto *trunc_mode = SPDLOG_FILENAME_T("wb");
 
-    if (event_handlers_.before_open)
+    if (event_handlers_.before_open) {
-    {
         event_handlers_.before_open(filename_);
     }
-    for (int tries = 0; tries < open_tries_; ++tries)
+    for (int tries = 0; tries < open_tries_; ++tries) {
-    {
         // create containing folder if not exists already.
         os::create_dir(os::dir_name(fname));
-        if (truncate)
+        if (truncate) {
-        {
             // Truncate by opening-and-closing a tmp file in "wb" mode, always
             // opening the actual log-we-write-to in "ab" mode, since that
             // interacts more politely with eternal processes that might
             // rotate/truncate the file underneath us.
             std::FILE *tmp;
-            if (os::fopen_s(&tmp, fname, trunc_mode))
+            if (os::fopen_s(&tmp, fname, trunc_mode)) {
-            {
                 continue;
             }
             std::fclose(tmp);
         }
-        if (!os::fopen_s(&fd_, fname, mode))
+        if (!os::fopen_s(&fd_, fname, mode)) {
-        {
+            if (event_handlers_.after_open) {
-            if (event_handlers_.after_open)
-            {
                 event_handlers_.after_open(filename_, fd_);
             }
             return;
@@ -70,76 +59,61 @@ SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
         details::os::sleep_for_millis(open_interval_);
     }
 
-    throw_spdlog_ex("Failed opening file " + os::filename_to_str(filename_) + " for writing", errno);
+    throw_spdlog_ex("Failed opening file " + os::filename_to_str(filename_) + " for writing",
+                    errno);
 }
 
-SPDLOG_INLINE void file_helper::reopen(bool truncate)
+SPDLOG_INLINE void file_helper::reopen(bool truncate) {
-{
+    if (filename_.empty()) {
-    if (filename_.empty())
-    {
         throw_spdlog_ex("Failed re opening file - was not opened before");
     }
     this->open(filename_, truncate);
 }
 
-SPDLOG_INLINE void file_helper::flush()
+SPDLOG_INLINE void file_helper::flush() {
-{
+    if (std::fflush(fd_) != 0) {
-    if (std::fflush(fd_) != 0)
-    {
         throw_spdlog_ex("Failed flush to file " + os::filename_to_str(filename_), errno);
     }
 }
 
-SPDLOG_INLINE void file_helper::sync()
+SPDLOG_INLINE void file_helper::sync() {
-{
+    if (!os::fsync(fd_)) {
-    if (!os::fsync(fd_))
-    {
         throw_spdlog_ex("Failed to fsync file " + os::filename_to_str(filename_), errno);
     }
 }
 
-SPDLOG_INLINE void file_helper::close()
+SPDLOG_INLINE void file_helper::close() {
-{
+    if (fd_ != nullptr) {
-    if (fd_ != nullptr)
+        if (event_handlers_.before_close) {
-    {
-        if (event_handlers_.before_close)
-        {
             event_handlers_.before_close(filename_, fd_);
         }
 
         std::fclose(fd_);
         fd_ = nullptr;
 
-        if (event_handlers_.after_close)
+        if (event_handlers_.after_close) {
-        {
             event_handlers_.after_close(filename_);
         }
     }
 }
 
-SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf)
+SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf) {
-{
+    if(fd_ == nullptr) return;
     size_t msg_size = buf.size();
     auto data = buf.data();
-    if (std::fwrite(data, 1, msg_size, fd_) != msg_size)
+    if (std::fwrite(data, 1, msg_size, fd_) != msg_size) {
-    {
         throw_spdlog_ex("Failed writing to file " + os::filename_to_str(filename_), errno);
     }
 }
 
-SPDLOG_INLINE size_t file_helper::size() const
+SPDLOG_INLINE size_t file_helper::size() const {
-{
+    if (fd_ == nullptr) {
-    if (fd_ == nullptr)
-    {
         throw_spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(filename_));
     }
     return os::filesize(fd_);
 }
 
-SPDLOG_INLINE const filename_t &file_helper::filename() const
+SPDLOG_INLINE const filename_t &file_helper::filename() const { return filename_; }
-{
-    return filename_;
-}
 
 //
 // return file path and its extension:
@@ -154,21 +128,19 @@ SPDLOG_INLINE const filename_t &file_helper::filename() const
 // ".mylog" => (".mylog". "")
 // "my_folder/.mylog" => ("my_folder/.mylog", "")
 // "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
-SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension(const filename_t &fname)
+SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension(
-{
+    const filename_t &fname) {
     auto ext_index = fname.rfind('.');
 
     // no valid extension found - return whole path and empty string as
     // extension
-    if (ext_index == filename_t::npos || ext_index == 0 || ext_index == fname.size() - 1)
+    if (ext_index == filename_t::npos || ext_index == 0 || ext_index == fname.size() - 1) {
-    {
         return std::make_tuple(fname, filename_t());
     }
 
     // treat cases like "/etc/rc.d/somelogfile or "/abc/.hiddenfile"
     auto folder_index = fname.find_last_of(details::os::folder_seps_filename);
-    if (folder_index != filename_t::npos && folder_index >= ext_index - 1)
+    if (folder_index != filename_t::npos && folder_index >= ext_index - 1) {
-    {
         return std::make_tuple(fname, filename_t());
     }
 
@@ -176,5 +148,5 @@ SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension
     return std::make_tuple(fname.substr(0, ext_index), fname.substr(ext_index));
 }
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/file_helper.h

@@ -13,8 +13,7 @@ namespace details {
 // When failing to open a file, retry several times(5) with a delay interval(10 ms).
 // Throw spdlog_ex exception on errors.
 
-class SPDLOG_API file_helper
+class SPDLOG_API file_helper {
-{
 public:
     file_helper() = default;
     explicit file_helper(const file_event_handlers &event_handlers);
@@ -54,9 +53,9 @@ private:
     filename_t filename_;
     file_event_handlers event_handlers_;
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "file_helper-inl.h"
+    #include "file_helper-inl.h"
 #endif

include/spdlog/details/fmt_helper.h

@@ -3,14 +3,14 @@
 #pragma once
 
 #include <chrono>
-#include <type_traits>
 #include <iterator>
-#include <spdlog/fmt/fmt.h>
 #include <spdlog/common.h>
+#include <spdlog/fmt/fmt.h>
+#include <type_traits>
 
 #ifdef SPDLOG_USE_STD_FORMAT
-#    include <charconv>
+    #include <charconv>
-#    include <limits>
+    #include <limits>
 #endif
 
 // Some fmt helpers to efficiently format and pad ints and strings
@@ -18,140 +18,117 @@ namespace spdlog {
 namespace details {
 namespace fmt_helper {
 
-inline void append_string_view(spdlog::string_view_t view, memory_buf_t &dest)
+inline void append_string_view(spdlog::string_view_t view, memory_buf_t &dest) {
-{
     auto *buf_ptr = view.data();
     dest.append(buf_ptr, buf_ptr + view.size());
 }
 
 #ifdef SPDLOG_USE_STD_FORMAT
-template<typename T>
+template <typename T>
-inline void append_int(T n, memory_buf_t &dest)
+inline void append_int(T n, memory_buf_t &dest) {
-{
     // Buffer should be large enough to hold all digits (digits10 + 1) and a sign
     SPDLOG_CONSTEXPR const auto BUF_SIZE = std::numeric_limits<T>::digits10 + 2;
     char buf[BUF_SIZE];
 
     auto [ptr, ec] = std::to_chars(buf, buf + BUF_SIZE, n, 10);
-    if (ec == std::errc())
+    if (ec == std::errc()) {
-    {
         dest.append(buf, ptr);
-    }
+    } else {
-    else
-    {
         throw_spdlog_ex("Failed to format int", static_cast<int>(ec));
     }
 }
 #else
-template<typename T>
+template <typename T>
-inline void append_int(T n, memory_buf_t &dest)
+inline void append_int(T n, memory_buf_t &dest) {
-{
     fmt::format_int i(n);
     dest.append(i.data(), i.data() + i.size());
 }
 #endif
 
-template<typename T>
+template <typename T>
-SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n)
+SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n) {
-{
     // taken from fmt: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/format.h#L899-L912
     unsigned int count = 1;
-    for (;;)
+    for (;;) {
-    {
         // Integer division is slow so do it for a group of four digits instead
         // of for every digit. The idea comes from the talk by Alexandrescu
         // "Three Optimization Tips for C++". See speed-test for a comparison.
-        if (n < 10)
+        if (n < 10) return count;
-            return count;
+        if (n < 100) return count + 1;
-        if (n < 100)
+        if (n < 1000) return count + 2;
-            return count + 1;
+        if (n < 10000) return count + 3;
-        if (n < 1000)
-            return count + 2;
-        if (n < 10000)
-            return count + 3;
         n /= 10000u;
         count += 4;
     }
 }
 
-template<typename T>
+template <typename T>
-inline unsigned int count_digits(T n)
+inline unsigned int count_digits(T n) {
-{
+    using count_type =
-    using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
+        typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
 #ifdef SPDLOG_USE_STD_FORMAT
     return count_digits_fallback(static_cast<count_type>(n));
 #else
     return static_cast<unsigned int>(fmt::
-// fmt 7.0.0 renamed the internal namespace to detail.
+    // fmt 7.0.0 renamed the internal namespace to detail.
-// See: https://github.com/fmtlib/fmt/issues/1538
+    // See: https://github.com/fmtlib/fmt/issues/1538
-#    if FMT_VERSION < 70000
+    #if FMT_VERSION < 70000
-            internal
+                                         internal
-#    else
+    #else
-            detail
+                                         detail
-#    endif
+    #endif
-        ::count_digits(static_cast<count_type>(n)));
+                                     ::count_digits(static_cast<count_type>(n)));
 #endif
 }
 
-inline void pad2(int n, memory_buf_t &dest)
+inline void pad2(int n, memory_buf_t &dest) {
-{
+    if (n >= 0 && n < 100)  // 0-99
-    if (n >= 0 && n < 100) // 0-99
     {
         dest.push_back(static_cast<char>('0' + n / 10));
         dest.push_back(static_cast<char>('0' + n % 10));
-    }
+    } else  // unlikely, but just in case, let fmt deal with it
-    else // unlikely, but just in case, let fmt deal with it
     {
         fmt_lib::format_to(std::back_inserter(dest), SPDLOG_FMT_STRING("{:02}"), n);
     }
 }
 
-template<typename T>
+template <typename T>
-inline void pad_uint(T n, unsigned int width, memory_buf_t &dest)
+inline void pad_uint(T n, unsigned int width, memory_buf_t &dest) {
-{
     static_assert(std::is_unsigned<T>::value, "pad_uint must get unsigned T");
-    for (auto digits = count_digits(n); digits < width; digits++)
+    for (auto digits = count_digits(n); digits < width; digits++) {
-    {
         dest.push_back('0');
     }
     append_int(n, dest);
 }
 
-template<typename T>
+template <typename T>
-inline void pad3(T n, memory_buf_t &dest)
+inline void pad3(T n, memory_buf_t &dest) {
-{
     static_assert(std::is_unsigned<T>::value, "pad3 must get unsigned T");
-    if (n < 1000)
+    if (n < 1000) {
-    {
         dest.push_back(static_cast<char>(n / 100 + '0'));
         n = n % 100;
         dest.push_back(static_cast<char>((n / 10) + '0'));
         dest.push_back(static_cast<char>((n % 10) + '0'));
-    }
+    } else {
-    else
-    {
         append_int(n, dest);
     }
 }
 
-template<typename T>
+template <typename T>
-inline void pad6(T n, memory_buf_t &dest)
+inline void pad6(T n, memory_buf_t &dest) {
-{
     pad_uint(n, 6, dest);
 }
 
-template<typename T>
+template <typename T>
-inline void pad9(T n, memory_buf_t &dest)
+inline void pad9(T n, memory_buf_t &dest) {
-{
     pad_uint(n, 9, dest);
 }
 
 // return fraction of a second of the given time_point.
 // e.g.
 // fraction<std::milliseconds>(tp) -> will return the millis part of the second
-template<typename ToDuration>
+template <typename ToDuration>
-inline ToDuration time_fraction(log_clock::time_point tp)
+inline ToDuration time_fraction(log_clock::time_point tp) {
-{
     using std::chrono::duration_cast;
     using std::chrono::seconds;
     auto duration = tp.time_since_epoch();
@@ -159,6 +136,6 @@ inline ToDuration time_fraction(log_clock::time_point tp)
     return duration_cast<ToDuration>(duration) - duration_cast<ToDuration>(secs);
 }
 
-} // namespace fmt_helper
+}  // namespace fmt_helper
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/log_msg-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/log_msg.h>
+    #include <spdlog/details/log_msg.h>
 #endif
 
 #include <spdlog/details/os.h>
@@ -12,26 +12,33 @@
 namespace spdlog {
 namespace details {
 
-SPDLOG_INLINE log_msg::log_msg(spdlog::log_clock::time_point log_time, spdlog::source_loc loc, string_view_t a_logger_name,
+SPDLOG_INLINE log_msg::log_msg(spdlog::log_clock::time_point log_time,
-    spdlog::level::level_enum lvl, spdlog::string_view_t msg)
+                               spdlog::source_loc loc,
-    : logger_name(a_logger_name)
+                               string_view_t a_logger_name,
-    , level(lvl)
+                               spdlog::level::level_enum lvl,
-    , time(log_time)
+                               spdlog::string_view_t msg)
+    : logger_name(a_logger_name),
+      level(lvl),
+      time(log_time)
 #ifndef SPDLOG_NO_THREAD_ID
-    , thread_id(os::thread_id())
+      ,
+      thread_id(os::thread_id())
 #endif
-    , source(loc)
+      ,
-    , payload(msg)
+      source(loc),
-{}
+      payload(msg) {
+}
 
-SPDLOG_INLINE log_msg::log_msg(
+SPDLOG_INLINE log_msg::log_msg(spdlog::source_loc loc,
-    spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg)
+                               string_view_t a_logger_name,
-    : log_msg(os::now(), loc, a_logger_name, lvl, msg)
+                               spdlog::level::level_enum lvl,
-{}
+                               spdlog::string_view_t msg)
+    : log_msg(os::now(), loc, a_logger_name, lvl, msg) {}
 
-SPDLOG_INLINE log_msg::log_msg(string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg)
+SPDLOG_INLINE log_msg::log_msg(string_view_t a_logger_name,
-    : log_msg(os::now(), source_loc{}, a_logger_name, lvl, msg)
+                               spdlog::level::level_enum lvl,
-{}
+                               spdlog::string_view_t msg)
+    : log_msg(os::now(), source_loc{}, a_logger_name, lvl, msg) {}
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/log_msg.h

@@ -8,10 +8,13 @@
 
 namespace spdlog {
 namespace details {
-struct SPDLOG_API log_msg
+struct SPDLOG_API log_msg {
-{
     log_msg() = default;
-    log_msg(log_clock::time_point log_time, source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
+    log_msg(log_clock::time_point log_time,
+            source_loc loc,
+            string_view_t logger_name,
+            level::level_enum lvl,
+            string_view_t msg);
     log_msg(source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
     log_msg(string_view_t logger_name, level::level_enum lvl, string_view_t msg);
     log_msg(const log_msg &other) = default;
@@ -29,9 +32,9 @@ struct SPDLOG_API log_msg
     source_loc source;
     string_view_t payload;
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "log_msg-inl.h"
+    #include "log_msg-inl.h"
 #endif

include/spdlog/details/log_msg_buffer-inl.h

@@ -4,35 +4,33 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/log_msg_buffer.h>
+    #include <spdlog/details/log_msg_buffer.h>
 #endif
 
 namespace spdlog {
 namespace details {
 
 SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg &orig_msg)
-    : log_msg{orig_msg}
+    : log_msg{orig_msg} {
-{
     buffer.append(logger_name.begin(), logger_name.end());
     buffer.append(payload.begin(), payload.end());
     update_string_views();
 }
 
 SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
-    : log_msg{other}
+    : log_msg{other} {
-{
     buffer.append(logger_name.begin(), logger_name.end());
     buffer.append(payload.begin(), payload.end());
     update_string_views();
 }
 
-SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT : log_msg{other}, buffer{std::move(other.buffer)}
+SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT
-{
+    : log_msg{other},
+      buffer{std::move(other.buffer)} {
     update_string_views();
 }
 
-SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &other)
+SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &other) {
-{
     log_msg::operator=(other);
     buffer.clear();
     buffer.append(other.buffer.data(), other.buffer.data() + other.buffer.size());
@@ -40,19 +38,17 @@ SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &ot
     return *this;
 }
 
-SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT {
-{
     log_msg::operator=(other);
     buffer = std::move(other.buffer);
     update_string_views();
     return *this;
 }
 
-SPDLOG_INLINE void log_msg_buffer::update_string_views()
+SPDLOG_INLINE void log_msg_buffer::update_string_views() {
-{
     logger_name = string_view_t{buffer.data(), logger_name.size()};
     payload = string_view_t{buffer.data() + logger_name.size(), payload.size()};
 }
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/log_msg_buffer.h

@@ -11,8 +11,7 @@ namespace details {
 // Extend log_msg with internal buffer to store its payload.
 // This is needed since log_msg holds string_views that points to stack data.
 
-class SPDLOG_API log_msg_buffer : public log_msg
+class SPDLOG_API log_msg_buffer : public log_msg {
-{
     memory_buf_t buffer;
     void update_string_views();
 
@@ -25,9 +24,9 @@ public:
     log_msg_buffer &operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT;
 };
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "log_msg_buffer-inl.h"
+    #include "log_msg_buffer-inl.h"
 #endif

include/spdlog/details/mpmc_blocking_q.h

@@ -12,25 +12,23 @@
 
 #include <spdlog/details/circular_q.h>
 
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
 
 namespace spdlog {
 namespace details {
 
-template<typename T>
+template <typename T>
-class mpmc_blocking_queue
+class mpmc_blocking_queue {
-{
 public:
     using item_type = T;
     explicit mpmc_blocking_queue(size_t max_items)
-        : q_(max_items)
+        : q_(max_items) {}
-    {}
 
 #ifndef __MINGW32__
     // try to enqueue and block if no room left
-    void enqueue(T &&item)
+    void enqueue(T &&item) {
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
             pop_cv_.wait(lock, [this] { return !this->q_.full(); });
@@ -40,8 +38,7 @@ public:
     }
 
     // enqueue immediately. overrun oldest message in the queue if no room left.
-    void enqueue_nowait(T &&item)
+    void enqueue_nowait(T &&item) {
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
             q_.push_back(std::move(item));
@@ -49,14 +46,29 @@ public:
         push_cv_.notify_one();
     }
 
-    // dequeue with a timeout.
+    void enqueue_if_have_room(T &&item) {
-    // Return true, if succeeded dequeue item, false otherwise
+        bool pushed = false;
-    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
-            if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+            if (!q_.full()) {
-            {
+                q_.push_back(std::move(item));
+                pushed = true;
+            }
+        }
+
+        if (pushed) {
+            push_cv_.notify_one();
+        } else {
+            ++discard_counter_;
+        }
+    }
+
+    // dequeue with a timeout.
+    // Return true, if succeeded dequeue item, false otherwise
+    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration) {
+        {
+            std::unique_lock<std::mutex> lock(queue_mutex_);
+            if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); })) {
                 return false;
             }
             popped_item = std::move(q_.front());
@@ -67,8 +79,7 @@ public:
     }
 
     // blocking dequeue without a timeout.
-    void dequeue(T &popped_item)
+    void dequeue(T &popped_item) {
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
             push_cv_.wait(lock, [this] { return !this->q_.empty(); });
@@ -83,8 +94,7 @@ public:
     // so release the mutex at the very end each function.
 
     // try to enqueue and block if no room left
-    void enqueue(T &&item)
+    void enqueue(T &&item) {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         pop_cv_.wait(lock, [this] { return !this->q_.full(); });
         q_.push_back(std::move(item));
@@ -92,20 +102,32 @@ public:
     }
 
     // enqueue immediately. overrun oldest message in the queue if no room left.
-    void enqueue_nowait(T &&item)
+    void enqueue_nowait(T &&item) {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         q_.push_back(std::move(item));
         push_cv_.notify_one();
     }
 
+    void enqueue_if_have_room(T &&item) {
+        bool pushed = false;
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        if (!q_.full()) {
+            q_.push_back(std::move(item));
+            pushed = true;
+        }
+
+        if (pushed) {
+            push_cv_.notify_one();
+        } else {
+            ++discard_counter_;
+        }
+    }
+
     // dequeue with a timeout.
     // Return true, if succeeded dequeue item, false otherwise
-    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
+    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration) {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
-        if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+        if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); })) {
-        {
             return false;
         }
         popped_item = std::move(q_.front());
@@ -115,8 +137,7 @@ public:
     }
 
     // blocking dequeue without a timeout.
-    void dequeue(T &popped_item)
+    void dequeue(T &popped_item) {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         push_cv_.wait(lock, [this] { return !this->q_.empty(); });
         popped_item = std::move(q_.front());
@@ -126,29 +147,31 @@ public:
 
 #endif
 
-    size_t overrun_counter()
+    size_t overrun_counter() {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         return q_.overrun_counter();
     }
 
-    size_t size()
+    size_t discard_counter() { return discard_counter_.load(std::memory_order_relaxed); }
-    {
+
+    size_t size() {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         return q_.size();
     }
 
-    void reset_overrun_counter()
+    void reset_overrun_counter() {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         q_.reset_overrun_counter();
     }
 
+    void reset_discard_counter() { discard_counter_.store(0, std::memory_order_relaxed); }
+
 private:
     std::mutex queue_mutex_;
     std::condition_variable push_cv_;
     std::condition_variable pop_cv_;
     spdlog::details::circular_q<T> q_;
+    std::atomic<size_t> discard_counter_{0};
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/null_mutex.h

@@ -9,37 +9,27 @@
 
 namespace spdlog {
 namespace details {
-struct null_mutex
+struct null_mutex {
-{
     void lock() const {}
     void unlock() const {}
 };
 
-struct null_atomic_int
+struct null_atomic_int {
-{
     int value;
     null_atomic_int() = default;
 
     explicit null_atomic_int(int new_value)
-        : value(new_value)
+        : value(new_value) {}
-    {}
 
-    int load(std::memory_order = std::memory_order_relaxed) const
+    int load(std::memory_order = std::memory_order_relaxed) const { return value; }
-    {
-        return value;
-    }
 
-    void store(int new_value, std::memory_order = std::memory_order_relaxed)
+    void store(int new_value, std::memory_order = std::memory_order_relaxed) { value = new_value; }
-    {
-        value = new_value;
-    }
 
-    int exchange(int new_value, std::memory_order = std::memory_order_relaxed)
+    int exchange(int new_value, std::memory_order = std::memory_order_relaxed) {
-    {
         std::swap(new_value, value);
-        return new_value; // return value before the call
+        return new_value;  // return value before the call
     }
 };
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/os-inl.h

@@ -4,92 +4,88 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/os.h>
+    #include <spdlog/details/os.h>
 #endif
 
 #include <spdlog/common.h>
 
 #include <algorithm>
+#include <array>
 #include <chrono>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
 #include <string>
-#include <thread>
-#include <array>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <thread>
 
 #ifdef _WIN32
+    #include <spdlog/details/windows_include.h>
+    #include <fileapi.h>  // for FlushFileBuffers
+    #include <io.h>       // for _get_osfhandle, _isatty, _fileno
+    #include <process.h>  // for _get_pid
 
-#    include <io.h>      // for _get_osfhandle, _isatty, _fileno
+    #ifdef __MINGW32__
-#    include <process.h> // for _get_pid
+        #include <share.h>
-#    include <spdlog/details/windows_include.h>
+    #endif
-#    include <fileapi.h> // for FlushFileBuffers
 
-#    ifdef __MINGW32__
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
-#        include <share.h>
+        #include <cassert>
-#    endif
+        #include <limits>
+    #endif
 
-#    if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
+    #include <direct.h>  // for _mkdir/_wmkdir
-#        include <limits>
-#        include <cassert>
-#    endif
 
-#    include <direct.h> // for _mkdir/_wmkdir
+#else  // unix
 
-#else // unix
+    #include <fcntl.h>
+    #include <unistd.h>
 
-#    include <fcntl.h>
+    #ifdef __linux__
-#    include <unistd.h>
+        #include <sys/syscall.h>  //Use gettid() syscall under linux to get thread id
 
-#    ifdef __linux__
+    #elif defined(_AIX)
-#        include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
+        #include <pthread.h>  // for pthread_getthrds_np
 
-#    elif defined(_AIX)
+    #elif defined(__DragonFly__) || defined(__FreeBSD__)
-#        include <pthread.h> // for pthread_getthrds_np
+        #include <pthread_np.h>  // for pthread_getthreadid_np
 
-#    elif defined(__DragonFly__) || defined(__FreeBSD__)
+    #elif defined(__NetBSD__)
-#        include <pthread_np.h> // for pthread_getthreadid_np
+        #include <lwp.h>  // for _lwp_self
 
-#    elif defined(__NetBSD__)
+    #elif defined(__sun)
-#        include <lwp.h> // for _lwp_self
+        #include <thread.h>  // for thr_self
+    #endif
 
-#    elif defined(__sun)
+#endif  // unix
-#        include <thread.h> // for thr_self
-#    endif
-
-#endif // unix
 
 #if defined __APPLE__
-#    include <AvailabilityMacros.h>
+    #include <AvailabilityMacros.h>
 #endif
 
-#ifndef __has_feature          // Clang - feature checking macros.
+#ifndef __has_feature           // Clang - feature checking macros.
-#    define __has_feature(x) 0 // Compatibility with non-clang compilers.
+    #define __has_feature(x) 0  // Compatibility with non-clang compilers.
 #endif
 
 namespace spdlog {
 namespace details {
 namespace os {
 
-SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT
+SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT {
-{
-
 #if defined __linux__ && defined SPDLOG_CLOCK_COARSE
     timespec ts;
     ::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
     return std::chrono::time_point<log_clock, typename log_clock::duration>(
-        std::chrono::duration_cast<typename log_clock::duration>(std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
+        std::chrono::duration_cast<typename log_clock::duration>(
+            std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
 
 #else
     return log_clock::now();
 #endif
 }
-SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     std::tm tm;
     ::localtime_s(&tm, &time_tt);
@@ -100,15 +96,12 @@ SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
     return tm;
 }
 
-SPDLOG_INLINE std::tm localtime() SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm localtime() SPDLOG_NOEXCEPT {
-{
     std::time_t now_t = ::time(nullptr);
     return localtime(now_t);
 }
 
-SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     std::tm tm;
     ::gmtime_s(&tm, &time_tt);
@@ -119,55 +112,49 @@ SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
     return tm;
 }
 
-SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT {
-{
     std::time_t now_t = ::time(nullptr);
     return gmtime(now_t);
 }
 
 // fopen_s on non windows for writing
-SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode)
+SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode) {
-{
 #ifdef _WIN32
-#    ifdef SPDLOG_WCHAR_FILENAMES
+    #ifdef SPDLOG_WCHAR_FILENAMES
     *fp = ::_wfsopen((filename.c_str()), mode.c_str(), _SH_DENYNO);
-#    else
+    #else
     *fp = ::_fsopen((filename.c_str()), mode.c_str(), _SH_DENYNO);
-#    endif
+    #endif
-#    if defined(SPDLOG_PREVENT_CHILD_FD)
+    #if defined(SPDLOG_PREVENT_CHILD_FD)
-    if (*fp != nullptr)
+    if (*fp != nullptr) {
-    {
         auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(::_fileno(*fp)));
-        if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
+        if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0)) {
-        {
             ::fclose(*fp);
             *fp = nullptr;
         }
     }
-#    endif
+    #endif
-#else // unix
+#else  // unix
-#    if defined(SPDLOG_PREVENT_CHILD_FD)
+    #if defined(SPDLOG_PREVENT_CHILD_FD)
     const int mode_flag = mode == SPDLOG_FILENAME_T("ab") ? O_APPEND : O_TRUNC;
-    const int fd = ::open((filename.c_str()), O_CREAT | O_WRONLY | O_CLOEXEC | mode_flag, mode_t(0644));
+    const int fd =
-    if (fd == -1)
+        ::open((filename.c_str()), O_CREAT | O_WRONLY | O_CLOEXEC | mode_flag, mode_t(0644));
-    {
+    if (fd == -1) {
         return true;
     }
     *fp = ::fdopen(fd, mode.c_str());
-    if (*fp == nullptr)
+    if (*fp == nullptr) {
-    {
         ::close(fd);
     }
-#    else
+    #else
     *fp = ::fopen((filename.c_str()), mode.c_str());
-#    endif
+    #endif
 #endif
 
     return *fp == nullptr;
 }
 
-SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT
+SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT {
-{
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
     return ::_wremove(filename.c_str());
 #else
@@ -175,13 +162,11 @@ SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT
 #endif
 }
 
-SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT
+SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT {
-{
     return path_exists(filename) ? remove(filename) : 0;
 }
 
-SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT
+SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT {
-{
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
     return ::_wrename(filename1.c_str(), filename2.c_str());
 #else
@@ -190,115 +175,103 @@ SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename
 }
 
 // Return true if path exists (file or directory)
-SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT
+SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT {
-{
 #ifdef _WIN32
-#    ifdef SPDLOG_WCHAR_FILENAMES
+    #ifdef SPDLOG_WCHAR_FILENAMES
     auto attribs = ::GetFileAttributesW(filename.c_str());
-#    else
+    #else
     auto attribs = ::GetFileAttributesA(filename.c_str());
-#    endif
+    #endif
     return attribs != INVALID_FILE_ATTRIBUTES;
-#else // common linux/unix all have the stat system call
+#else  // common linux/unix all have the stat system call
     struct stat buffer;
     return (::stat(filename.c_str(), &buffer) == 0);
 #endif
 }
 
 #ifdef _MSC_VER
-// avoid warning about unreachable statement at the end of filesize()
+    // avoid warning about unreachable statement at the end of filesize()
-#    pragma warning(push)
+    #pragma warning(push)
-#    pragma warning(disable : 4702)
+    #pragma warning(disable : 4702)
 #endif
 
 // Return file size according to open FILE* object
-SPDLOG_INLINE size_t filesize(FILE *f)
+SPDLOG_INLINE size_t filesize(FILE *f) {
-{
+    if (f == nullptr) {
-    if (f == nullptr)
-    {
         throw_spdlog_ex("Failed getting file size. fd is null");
     }
 #if defined(_WIN32) && !defined(__CYGWIN__)
     int fd = ::_fileno(f);
-#    if defined(_WIN64) // 64 bits
+    #if defined(_WIN64)  // 64 bits
     __int64 ret = ::_filelengthi64(fd);
-    if (ret >= 0)
+    if (ret >= 0) {
-    {
         return static_cast<size_t>(ret);
     }
 
-#    else // windows 32 bits
+    #else  // windows 32 bits
     long ret = ::_filelength(fd);
-    if (ret >= 0)
+    if (ret >= 0) {
-    {
         return static_cast<size_t>(ret);
     }
-#    endif
+    #endif
 
-#else // unix
+#else  // unix
-// OpenBSD and AIX doesn't compile with :: before the fileno(..)
+    // OpenBSD and AIX doesn't compile with :: before the fileno(..)
-#    if defined(__OpenBSD__) || defined(_AIX)
+    #if defined(__OpenBSD__) || defined(_AIX)
     int fd = fileno(f);
-#    else
+    #else
     int fd = ::fileno(f);
-#    endif
+    #endif
-// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
+    // 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
-#    if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+    #if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && \
+        (defined(__LP64__) || defined(_LP64))
     struct stat64 st;
-    if (::fstat64(fd, &st) == 0)
+    if (::fstat64(fd, &st) == 0) {
-    {
         return static_cast<size_t>(st.st_size);
     }
-#    else // other unix or linux 32 bits or cygwin
+    #else  // other unix or linux 32 bits or cygwin
     struct stat st;
-    if (::fstat(fd, &st) == 0)
+    if (::fstat(fd, &st) == 0) {
-    {
         return static_cast<size_t>(st.st_size);
     }
-#    endif
+    #endif
 #endif
     throw_spdlog_ex("Failed getting file size from fd", errno);
-    return 0; // will not be reached.
+    return 0;  // will not be reached.
 }
 
 #ifdef _MSC_VER
-#    pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
 // Return utc offset in minutes or throw spdlog_ex on failure
-SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
+SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm) {
-{
-
 #ifdef _WIN32
-#    if _WIN32_WINNT < _WIN32_WINNT_WS08
+    #if _WIN32_WINNT < _WIN32_WINNT_WS08
     TIME_ZONE_INFORMATION tzinfo;
     auto rv = ::GetTimeZoneInformation(&tzinfo);
-#    else
+    #else
     DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
     auto rv = ::GetDynamicTimeZoneInformation(&tzinfo);
-#    endif
+    #endif
-    if (rv == TIME_ZONE_ID_INVALID)
+    if (rv == TIME_ZONE_ID_INVALID) throw_spdlog_ex("Failed getting timezone info. ", errno);
-        throw_spdlog_ex("Failed getting timezone info. ", errno);
 
     int offset = -tzinfo.Bias;
-    if (tm.tm_isdst)
+    if (tm.tm_isdst) {
-    {
         offset -= tzinfo.DaylightBias;
-    }
+    } else {
-    else
-    {
         offset -= tzinfo.StandardBias;
     }
     return offset;
 #else
 
-#    if defined(sun) || defined(__sun) || defined(_AIX) || (defined(__NEWLIB__) && !defined(__TM_GMTOFF)) ||                               \
+    #if defined(sun) || defined(__sun) || defined(_AIX) || \
+        (defined(__NEWLIB__) && !defined(__TM_GMTOFF)) ||  \
         (!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
     // 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
-    struct helper
+    struct helper {
-    {
+        static long int calculate_gmt_offset(const std::tm &localtm = details::os::localtime(),
-        static long int calculate_gmt_offset(const std::tm &localtm = details::os::localtime(), const std::tm &gmtm = details::os::gmtime())
+                                             const std::tm &gmtm = details::os::gmtime()) {
-        {
             int local_year = localtm.tm_year + (1900 - 1);
             int gmt_year = gmtm.tm_year + (1900 - 1);
 
@@ -323,9 +296,9 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
     };
 
     auto offset_seconds = helper::calculate_gmt_offset(tm);
-#    else
+    #else
     auto offset_seconds = tm.tm_gmtoff;
-#    endif
+    #endif
 
     return static_cast<int>(offset_seconds / 60);
 #endif
@@ -334,14 +307,13 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
 // Return current thread id as size_t
 // It exists because the std::this_thread::get_id() is much slower(especially
 // under VS 2013)
-SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
+SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT {
-{
 #ifdef _WIN32
     return static_cast<size_t>(::GetCurrentThreadId());
 #elif defined(__linux__)
-#    if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
+    #if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
-#        define SYS_gettid __NR_gettid
+        #define SYS_gettid __NR_gettid
-#    endif
+    #endif
     return static_cast<size_t>(::syscall(SYS_gettid));
 #elif defined(_AIX)
     struct __pthrdsinfo buf;
@@ -360,34 +332,36 @@ SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
     return static_cast<size_t>(::thr_self());
 #elif __APPLE__
     uint64_t tid;
-    // There is no pthread_threadid_np prior to 10.6, and it is not supported on any PPC,
+    // There is no pthread_threadid_np prior to Mac OS X 10.6, and it is not supported on any PPC,
     // including 10.6.8 Rosetta. __POWERPC__ is Apple-specific define encompassing ppc and ppc64.
-#    if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) || defined(__POWERPC__)
+    #ifdef MAC_OS_X_VERSION_MAX_ALLOWED
-    tid = pthread_mach_thread_np(pthread_self());
-#    elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-    if (&pthread_threadid_np)
-    {
-        pthread_threadid_np(nullptr, &tid);
-    }
-    else
     {
+        #if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) || defined(__POWERPC__)
         tid = pthread_mach_thread_np(pthread_self());
+        #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+        if (&pthread_threadid_np) {
+            pthread_threadid_np(nullptr, &tid);
+        } else {
+            tid = pthread_mach_thread_np(pthread_self());
+        }
+        #else
+        pthread_threadid_np(nullptr, &tid);
+        #endif
     }
-#    else
+    #else
     pthread_threadid_np(nullptr, &tid);
-#    endif
+    #endif
     return static_cast<size_t>(tid);
-#else // Default to standard C++11 (other Unix)
+#else  // Default to standard C++11 (other Unix)
     return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
 #endif
 }
 
 // Return current thread id as size_t (from thread local storage)
-SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT
+SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT {
-{
 #if defined(SPDLOG_NO_TLS)
     return _thread_id();
-#else // cache thread id in tls
+#else  // cache thread id in tls
     static thread_local const size_t tid = _thread_id();
     return tid;
 #endif
@@ -395,8 +369,7 @@ SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT
 
 // This is avoid msvc issue in sleep_for that happens if the clock changes.
 // See https://github.com/gabime/spdlog/issues/609
-SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT
+SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT {
-{
 #if defined(_WIN32)
     ::Sleep(milliseconds);
 #else
@@ -406,22 +379,16 @@ SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT
 
 // wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
-SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
+SPDLOG_INLINE std::string filename_to_str(const filename_t &filename) {
-{
     memory_buf_t buf;
     wstr_to_utf8buf(filename, buf);
     return SPDLOG_BUF_TO_STRING(buf);
 }
 #else
-SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
+SPDLOG_INLINE std::string filename_to_str(const filename_t &filename) { return filename; }
-{
-    return filename;
-}
 #endif
 
-SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT
+SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     return conditional_static_cast<int>(::GetCurrentProcessId());
 #else
@@ -431,29 +398,29 @@ SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT
 
 // Determine if the terminal supports colors
 // Based on: https://github.com/agauniyal/rang/
-SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT
+SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT {
-{
 #ifdef _WIN32
     return true;
 #else
 
     static const bool result = []() {
         const char *env_colorterm_p = std::getenv("COLORTERM");
-        if (env_colorterm_p != nullptr)
+        if (env_colorterm_p != nullptr) {
-        {
             return true;
         }
 
-        static constexpr std::array<const char *, 16> terms = {{"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm", "linux",
+        static constexpr std::array<const char *, 16> terms = {
-            "msys", "putty", "rxvt", "screen", "vt100", "xterm", "alacritty", "vt102"}};
+            {"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm", "linux", "msys",
+             "putty", "rxvt", "screen", "vt100", "xterm", "alacritty", "vt102"}};
 
         const char *env_term_p = std::getenv("TERM");
-        if (env_term_p == nullptr)
+        if (env_term_p == nullptr) {
-        {
             return false;
         }
 
-        return std::any_of(terms.begin(), terms.end(), [&](const char *term) { return std::strstr(env_term_p, term) != nullptr; });
+        return std::any_of(terms.begin(), terms.end(), [&](const char *term) {
+            return std::strstr(env_term_p, term) != nullptr;
+        });
     }();
 
     return result;
@@ -462,9 +429,7 @@ SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT
 
 // Determine if the terminal attached
 // Source: https://github.com/agauniyal/rang/
-SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT
+SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     return ::_isatty(_fileno(file)) != 0;
 #else
@@ -473,82 +438,77 @@ SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT
 }
 
 #if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
-SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target)
+SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target) {
-{
+    if (wstr.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) / 2 - 1) {
-    if (wstr.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) / 2 - 1)
-    {
         throw_spdlog_ex("UTF-16 string is too big to be converted to UTF-8");
     }
 
     int wstr_size = static_cast<int>(wstr.size());
-    if (wstr_size == 0)
+    if (wstr_size == 0) {
-    {
         target.resize(0);
         return;
     }
 
     int result_size = static_cast<int>(target.capacity());
-    if ((wstr_size + 1) * 2 > result_size)
+    if ((wstr_size + 1) * 2 > result_size) {
-    {
+        result_size =
-        result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, NULL, 0, NULL, NULL);
+            ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, NULL, 0, NULL, NULL);
     }
 
-    if (result_size > 0)
+    if (result_size > 0) {
-    {
         target.resize(result_size);
-        result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, target.data(), result_size, NULL, NULL);
+        result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, target.data(),
+                                            result_size, NULL, NULL);
 
-        if (result_size > 0)
+        if (result_size > 0) {
-        {
             target.resize(result_size);
             return;
         }
     }
 
-    throw_spdlog_ex(fmt_lib::format("WideCharToMultiByte failed. Last error: {}", ::GetLastError()));
+    throw_spdlog_ex(
+        fmt_lib::format("WideCharToMultiByte failed. Last error: {}", ::GetLastError()));
 }
 
-SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target)
+SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target) {
-{
+    if (str.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) - 1) {
-    if (str.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) - 1)
-    {
         throw_spdlog_ex("UTF-8 string is too big to be converted to UTF-16");
     }
 
     int str_size = static_cast<int>(str.size());
-    if (str_size == 0)
+    if (str_size == 0) {
-    {
         target.resize(0);
         return;
     }
 
     // find the size to allocate for the result buffer
-    int result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, NULL, 0);
+    int result_size =
+        ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, NULL, 0);
 
-    if (result_size > 0)
+    if (result_size > 0) {
-    {
         target.resize(result_size);
-        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, target.data(), result_size);
+        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size,
-        if (result_size > 0)
+                                            target.data(), result_size);
-        {
+        if (result_size > 0) {
             assert(result_size == target.size());
             return;
         }
     }
 
-    throw_spdlog_ex(fmt_lib::format("MultiByteToWideChar failed. Last error: {}", ::GetLastError()));
+    throw_spdlog_ex(
+        fmt_lib::format("MultiByteToWideChar failed. Last error: {}", ::GetLastError()));
 }
-#endif // (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
+#endif  // (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) &&
+        // defined(_WIN32)
 
 // return true on success
-static SPDLOG_INLINE bool mkdir_(const filename_t &path)
+static SPDLOG_INLINE bool mkdir_(const filename_t &path) {
-{
 #ifdef _WIN32
-#    ifdef SPDLOG_WCHAR_FILENAMES
+    #ifdef SPDLOG_WCHAR_FILENAMES
     return ::_wmkdir(path.c_str()) == 0;
-#    else
+    #else
     return ::_mkdir(path.c_str()) == 0;
-#    endif
+    #endif
 #else
     return ::mkdir(path.c_str(), mode_t(0755)) == 0;
 #endif
@@ -556,33 +516,27 @@ static SPDLOG_INLINE bool mkdir_(const filename_t &path)
 
 // create the given directory - and all directories leading to it
 // return true on success or if the directory already exists
-SPDLOG_INLINE bool create_dir(const filename_t &path)
+SPDLOG_INLINE bool create_dir(const filename_t &path) {
-{
+    if (path_exists(path)) {
-    if (path_exists(path))
-    {
         return true;
     }
 
-    if (path.empty())
+    if (path.empty()) {
-    {
         return false;
     }
 
     size_t search_offset = 0;
-    do
+    do {
-    {
         auto token_pos = path.find_first_of(folder_seps_filename, search_offset);
         // treat the entire path as a folder if no folder separator not found
-        if (token_pos == filename_t::npos)
+        if (token_pos == filename_t::npos) {
-        {
             token_pos = path.size();
         }
 
         auto subdir = path.substr(0, token_pos);
 
-        if (!subdir.empty() && !path_exists(subdir) && !mkdir_(subdir))
+        if (!subdir.empty() && !path_exists(subdir) && !mkdir_(subdir)) {
-        {
+            return false;  // return error if failed creating dir
-            return false; // return error if failed creating dir
         }
         search_offset = token_pos + 1;
     } while (search_offset < path.size());
@@ -595,25 +549,22 @@ SPDLOG_INLINE bool create_dir(const filename_t &path)
 // "abc/" => "abc"
 // "abc" => ""
 // "abc///" => "abc//"
-SPDLOG_INLINE filename_t dir_name(const filename_t &path)
+SPDLOG_INLINE filename_t dir_name(const filename_t &path) {
-{
     auto pos = path.find_last_of(folder_seps_filename);
     return pos != filename_t::npos ? path.substr(0, pos) : filename_t{};
 }
 
-std::string SPDLOG_INLINE getenv(const char *field)
+std::string SPDLOG_INLINE getenv(const char *field) {
-{
-
 #if defined(_MSC_VER)
-#    if defined(__cplusplus_winrt)
+    #if defined(__cplusplus_winrt)
-    return std::string{}; // not supported under uwp
+    return std::string{};  // not supported under uwp
-#    else
+    #else
     size_t len = 0;
     char buf[128];
     bool ok = ::getenv_s(&len, buf, sizeof(buf), field) == 0;
     return ok ? buf : std::string{};
-#    endif
+    #endif
-#else // revert to getenv
+#else  // revert to getenv
     char *buf = ::getenv(field);
     return buf ? buf : std::string{};
 #endif
@@ -621,8 +572,7 @@ std::string SPDLOG_INLINE getenv(const char *field)
 
 // Do fsync by FILE handlerpointer
 // Return true on success
-SPDLOG_INLINE bool fsync(FILE *fp)
+SPDLOG_INLINE bool fsync(FILE *fp) {
-{
 #ifdef _WIN32
     return FlushFileBuffers(reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(fp)))) != 0;
 #else
@@ -630,6 +580,6 @@ SPDLOG_INLINE bool fsync(FILE *fp)
 #endif
 }
 
-} // namespace os
+}  // namespace os
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/os.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <ctime>  // std::time_t
 #include <spdlog/common.h>
-#include <ctime> // std::time_t
 
 namespace spdlog {
 namespace details {
@@ -22,26 +22,27 @@ SPDLOG_API std::tm gmtime() SPDLOG_NOEXCEPT;
 
 // eol definition
 #if !defined(SPDLOG_EOL)
-#    ifdef _WIN32
+    #ifdef _WIN32
-#        define SPDLOG_EOL "\r\n"
+        #define SPDLOG_EOL "\r\n"
-#    else
+    #else
-#        define SPDLOG_EOL "\n"
+        #define SPDLOG_EOL "\n"
-#    endif
+    #endif
 #endif
 
 SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL;
 
 // folder separator
 #if !defined(SPDLOG_FOLDER_SEPS)
-#    ifdef _WIN32
+    #ifdef _WIN32
-#        define SPDLOG_FOLDER_SEPS "\\/"
+        #define SPDLOG_FOLDER_SEPS "\\/"
-#    else
+    #else
-#        define SPDLOG_FOLDER_SEPS "/"
+        #define SPDLOG_FOLDER_SEPS "/"
-#    endif
+    #endif
 #endif
 
 SPDLOG_CONSTEXPR static const char folder_seps[] = SPDLOG_FOLDER_SEPS;
-SPDLOG_CONSTEXPR static const filename_t::value_type folder_seps_filename[] = SPDLOG_FILENAME_T(SPDLOG_FOLDER_SEPS);
+SPDLOG_CONSTEXPR static const filename_t::value_type folder_seps_filename[] =
+    SPDLOG_FILENAME_T(SPDLOG_FOLDER_SEPS);
 
 // fopen_s on non windows for writing
 SPDLOG_API bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode);
@@ -113,10 +114,10 @@ SPDLOG_API std::string getenv(const char *field);
 // Return true on success.
 SPDLOG_API bool fsync(FILE *fp);
 
-} // namespace os
+}  // namespace os
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "os-inl.h"
+    #include "os-inl.h"
 #endif

include/spdlog/details/periodic_worker-inl.h

@@ -4,17 +4,15 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/periodic_worker.h>
+    #include <spdlog/details/periodic_worker.h>
 #endif
 
 namespace spdlog {
 namespace details {
 
 // stop the worker thread and join it
-SPDLOG_INLINE periodic_worker::~periodic_worker()
+SPDLOG_INLINE periodic_worker::~periodic_worker() {
-{
+    if (worker_thread_.joinable()) {
-    if (worker_thread_.joinable())
-    {
         {
             std::lock_guard<std::mutex> lock(mutex_);
             active_ = false;
@@ -24,5 +22,5 @@ SPDLOG_INLINE periodic_worker::~periodic_worker()
     }
 }
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/periodic_worker.h

@@ -7,7 +7,8 @@
 //
 // RAII over the owned thread:
 //    creates the thread on construction.
-//    stops and joins the thread on destruction (if the thread is executing a callback, wait for it to finish first).
+//    stops and joins the thread on destruction (if the thread is executing a callback, wait for it
+//    to finish first).
 
 #include <chrono>
 #include <condition_variable>
@@ -17,25 +18,21 @@
 namespace spdlog {
 namespace details {
 
-class SPDLOG_API periodic_worker
+class SPDLOG_API periodic_worker {
-{
 public:
-    template<typename Rep, typename Period>
+    template <typename Rep, typename Period>
-    periodic_worker(const std::function<void()> &callback_fun, std::chrono::duration<Rep, Period> interval)
+    periodic_worker(const std::function<void()> &callback_fun,
-    {
+                    std::chrono::duration<Rep, Period> interval) {
         active_ = (interval > std::chrono::duration<Rep, Period>::zero());
-        if (!active_)
+        if (!active_) {
-        {
             return;
         }
 
         worker_thread_ = std::thread([this, callback_fun, interval]() {
-            for (;;)
+            for (;;) {
-            {
                 std::unique_lock<std::mutex> lock(this->mutex_);
-                if (this->cv_.wait_for(lock, interval, [this] { return !this->active_; }))
+                if (this->cv_.wait_for(lock, interval, [this] { return !this->active_; })) {
-                {
+                    return;  // active_ == false, so exit this thread
-                    return; // active_ == false, so exit this thread
                 }
                 callback_fun();
             }
@@ -52,9 +49,9 @@ private:
     std::mutex mutex_;
     std::condition_variable cv_;
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "periodic_worker-inl.h"
+    #include "periodic_worker-inl.h"
 #endif

include/spdlog/details/registry-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/registry.h>
+    #include <spdlog/details/registry.h>
 #endif
 
 #include <spdlog/common.h>
@@ -13,13 +13,13 @@
 #include <spdlog/pattern_formatter.h>
 
 #ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
-// support for the default stdout color logger
+    // support for the default stdout color logger
-#    ifdef _WIN32
+    #ifdef _WIN32
-#        include <spdlog/sinks/wincolor_sink.h>
+        #include <spdlog/sinks/wincolor_sink.h>
-#    else
+    #else
-#        include <spdlog/sinks/ansicolor_sink.h>
+        #include <spdlog/sinks/ansicolor_sink.h>
-#    endif
+    #endif
-#endif // SPDLOG_DISABLE_DEFAULT_LOGGER
+#endif  // SPDLOG_DISABLE_DEFAULT_LOGGER
 
 #include <chrono>
 #include <functional>
@@ -31,39 +31,34 @@ namespace spdlog {
 namespace details {
 
 SPDLOG_INLINE registry::registry()
-    : formatter_(new pattern_formatter())
+    : formatter_(new pattern_formatter()) {
-{
-
 #ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
     // create default logger (ansicolor_stdout_sink_mt or wincolor_stdout_sink_mt in windows).
-#    ifdef _WIN32
+    #ifdef _WIN32
     auto color_sink = std::make_shared<sinks::wincolor_stdout_sink_mt>();
-#    else
+    #else
     auto color_sink = std::make_shared<sinks::ansicolor_stdout_sink_mt>();
-#    endif
+    #endif
 
     const char *default_logger_name = "";
     default_logger_ = std::make_shared<spdlog::logger>(default_logger_name, std::move(color_sink));
     loggers_[default_logger_name] = default_logger_;
 
-#endif // SPDLOG_DISABLE_DEFAULT_LOGGER
+#endif  // SPDLOG_DISABLE_DEFAULT_LOGGER
 }
 
 SPDLOG_INLINE registry::~registry() = default;
 
-SPDLOG_INLINE void registry::register_logger(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::register_logger(std::shared_ptr<logger> new_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     register_logger_(std::move(new_logger));
 }
 
-SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     new_logger->set_formatter(formatter_->clone());
 
-    if (err_handler_)
+    if (err_handler_) {
-    {
         new_logger->set_error_handler(err_handler_);
     }
 
@@ -74,26 +69,22 @@ SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logge
 
     new_logger->flush_on(flush_level_);
 
-    if (backtrace_n_messages_ > 0)
+    if (backtrace_n_messages_ > 0) {
-    {
         new_logger->enable_backtrace(backtrace_n_messages_);
     }
 
-    if (automatic_registration_)
+    if (automatic_registration_) {
-    {
         register_logger_(std::move(new_logger));
     }
 }
 
-SPDLOG_INLINE std::shared_ptr<logger> registry::get(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> registry::get(const std::string &logger_name) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     auto found = loggers_.find(logger_name);
     return found == loggers_.end() ? nullptr : found->second;
 }
 
-SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger()
+SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     return default_logger_;
 }
@@ -102,141 +93,114 @@ SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger()
 // To be used directly by the spdlog default api (e.g. spdlog::info)
 // This make the default API faster, but cannot be used concurrently with set_default_logger().
 // e.g do not call set_default_logger() from one thread while calling spdlog::info() from another.
-SPDLOG_INLINE logger *registry::get_default_raw()
+SPDLOG_INLINE logger *registry::get_default_raw() { return default_logger_.get(); }
-{
-    return default_logger_.get();
-}
 
 // set default logger.
 // default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map.
-SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr<logger> new_default_logger)
+SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr<logger> new_default_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     // remove previous default logger from the map
-    if (default_logger_ != nullptr)
+    if (default_logger_ != nullptr) {
-    {
         loggers_.erase(default_logger_->name());
     }
-    if (new_default_logger != nullptr)
+    if (new_default_logger != nullptr) {
-    {
         loggers_[new_default_logger->name()] = new_default_logger;
     }
     default_logger_ = std::move(new_default_logger);
 }
 
-SPDLOG_INLINE void registry::set_tp(std::shared_ptr<thread_pool> tp)
+SPDLOG_INLINE void registry::set_tp(std::shared_ptr<thread_pool> tp) {
-{
     std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
     tp_ = std::move(tp);
 }
 
-SPDLOG_INLINE std::shared_ptr<thread_pool> registry::get_tp()
+SPDLOG_INLINE std::shared_ptr<thread_pool> registry::get_tp() {
-{
     std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
     return tp_;
 }
 
 // Set global formatter. Each sink in each logger will get a clone of this object
-SPDLOG_INLINE void registry::set_formatter(std::unique_ptr<formatter> formatter)
+SPDLOG_INLINE void registry::set_formatter(std::unique_ptr<formatter> formatter) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     formatter_ = std::move(formatter);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->set_formatter(formatter_->clone());
     }
 }
 
-SPDLOG_INLINE void registry::enable_backtrace(size_t n_messages)
+SPDLOG_INLINE void registry::enable_backtrace(size_t n_messages) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     backtrace_n_messages_ = n_messages;
 
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->enable_backtrace(n_messages);
     }
 }
 
-SPDLOG_INLINE void registry::disable_backtrace()
+SPDLOG_INLINE void registry::disable_backtrace() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     backtrace_n_messages_ = 0;
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->disable_backtrace();
     }
 }
 
-SPDLOG_INLINE void registry::set_level(level::level_enum log_level)
+SPDLOG_INLINE void registry::set_level(level::level_enum log_level) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->set_level(log_level);
     }
     global_log_level_ = log_level;
 }
 
-SPDLOG_INLINE void registry::flush_on(level::level_enum log_level)
+SPDLOG_INLINE void registry::flush_on(level::level_enum log_level) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->flush_on(log_level);
     }
     flush_level_ = log_level;
 }
 
-SPDLOG_INLINE void registry::set_error_handler(err_handler handler)
+SPDLOG_INLINE void registry::set_error_handler(err_handler handler) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->set_error_handler(handler);
     }
     err_handler_ = std::move(handler);
 }
 
-SPDLOG_INLINE void registry::apply_all(const std::function<void(const std::shared_ptr<logger>)> &fun)
+SPDLOG_INLINE void registry::apply_all(
-{
+    const std::function<void(const std::shared_ptr<logger>)> &fun) {
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         fun(l.second);
     }
 }
 
-SPDLOG_INLINE void registry::flush_all()
+SPDLOG_INLINE void registry::flush_all() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->flush();
     }
 }
 
-SPDLOG_INLINE void registry::drop(const std::string &logger_name)
+SPDLOG_INLINE void registry::drop(const std::string &logger_name) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     auto is_default_logger = default_logger_ && default_logger_->name() == logger_name;
     loggers_.erase(logger_name);
-    if (is_default_logger)
+    if (is_default_logger) {
-    {
         default_logger_.reset();
     }
 }
 
-SPDLOG_INLINE void registry::drop_all()
+SPDLOG_INLINE void registry::drop_all() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     loggers_.clear();
     default_logger_.reset();
 }
 
 // clean all resources and threads started by the registry
-SPDLOG_INLINE void registry::shutdown()
+SPDLOG_INLINE void registry::shutdown() {
-{
     {
         std::lock_guard<std::mutex> lock(flusher_mutex_);
         periodic_flusher_.reset();
@@ -250,66 +214,52 @@ SPDLOG_INLINE void registry::shutdown()
     }
 }
 
-SPDLOG_INLINE std::recursive_mutex &registry::tp_mutex()
+SPDLOG_INLINE std::recursive_mutex &registry::tp_mutex() { return tp_mutex_; }
-{
-    return tp_mutex_;
-}
 
-SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registration)
+SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registration) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     automatic_registration_ = automatic_registration;
 }
 
-SPDLOG_INLINE void registry::set_levels(log_levels levels, level::level_enum *global_level)
+SPDLOG_INLINE void registry::set_levels(log_levels levels, level::level_enum *global_level) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     log_levels_ = std::move(levels);
     auto global_level_requested = global_level != nullptr;
     global_log_level_ = global_level_requested ? *global_level : global_log_level_;
 
-    for (auto &logger : loggers_)
+    for (auto &logger : loggers_) {
-    {
         auto logger_entry = log_levels_.find(logger.first);
-        if (logger_entry != log_levels_.end())
+        if (logger_entry != log_levels_.end()) {
-        {
             logger.second->set_level(logger_entry->second);
-        }
+        } else if (global_level_requested) {
-        else if (global_level_requested)
-        {
             logger.second->set_level(*global_level);
         }
     }
 }
 
-SPDLOG_INLINE registry &registry::instance()
+SPDLOG_INLINE registry &registry::instance() {
-{
     static registry s_instance;
     return s_instance;
 }
 
-SPDLOG_INLINE void registry::apply_logger_env_levels(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::apply_logger_env_levels(std::shared_ptr<logger> new_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     auto it = log_levels_.find(new_logger->name());
     auto new_level = it != log_levels_.end() ? it->second : global_log_level_;
     new_logger->set_level(new_level);
 }
 
-SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name)
+SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name) {
-{
+    if (loggers_.find(logger_name) != loggers_.end()) {
-    if (loggers_.find(logger_name) != loggers_.end())
-    {
         throw_spdlog_ex("logger with name '" + logger_name + "' already exists");
     }
 }
 
-SPDLOG_INLINE void registry::register_logger_(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::register_logger_(std::shared_ptr<logger> new_logger) {
-{
     auto logger_name = new_logger->name();
     throw_if_exists_(logger_name);
     loggers_[logger_name] = std::move(new_logger);
 }
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/registry.h

@@ -14,9 +14,9 @@
 #include <chrono>
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <unordered_map>
-#include <mutex>
 
 namespace spdlog {
 class logger;
@@ -24,8 +24,7 @@ class logger;
 namespace details {
 class thread_pool;
 
-class SPDLOG_API registry
+class SPDLOG_API registry {
-{
 public:
     using log_levels = std::unordered_map<std::string, level::level_enum>;
     registry(const registry &) = delete;
@@ -39,7 +38,8 @@ public:
     // Return raw ptr to the default logger.
     // To be used directly by the spdlog default api (e.g. spdlog::info)
     // This make the default API faster, but cannot be used concurrently with set_default_logger().
-    // e.g do not call set_default_logger() from one thread while calling spdlog::info() from another.
+    // e.g do not call set_default_logger() from one thread while calling spdlog::info() from
+    // another.
     logger *get_default_raw();
 
     // set default logger.
@@ -61,9 +61,8 @@ public:
 
     void flush_on(level::level_enum log_level);
 
-    template<typename Rep, typename Period>
+    template <typename Rep, typename Period>
-    void flush_every(std::chrono::duration<Rep, Period> interval)
+    void flush_every(std::chrono::duration<Rep, Period> interval) {
-    {
         std::lock_guard<std::mutex> lock(flusher_mutex_);
         auto clbk = [this]() { this->flush_all(); };
         periodic_flusher_ = details::make_unique<periodic_worker>(clbk, interval);
@@ -115,9 +114,9 @@ private:
     size_t backtrace_n_messages_ = 0;
 };
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "registry-inl.h"
+    #include "registry-inl.h"
 #endif

include/spdlog/details/synchronous_factory.h

@@ -10,15 +10,13 @@ namespace spdlog {
 // Default logger factory-  creates synchronous loggers
 class logger;
 
-struct synchronous_factory
+struct synchronous_factory {
-{
+    template <typename Sink, typename... SinkArgs>
-    template<typename Sink, typename... SinkArgs>
+    static std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&...args) {
-    static std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&...args)
-    {
         auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
         auto new_logger = std::make_shared<spdlog::logger>(std::move(logger_name), std::move(sink));
         details::registry::instance().initialize_logger(new_logger);
         return new_logger;
     }
 };
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/tcp_client-windows.h

@@ -8,12 +8,12 @@
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
 
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string>
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 
 #pragma comment(lib, "Ws2_32.lib")
 #pragma comment(lib, "Mswsock.lib")
@@ -21,79 +21,61 @@
 
 namespace spdlog {
 namespace details {
-class tcp_client
+class tcp_client {
-{
     SOCKET socket_ = INVALID_SOCKET;
 
-    static void init_winsock_()
+    static void init_winsock_() {
-    {
         WSADATA wsaData;
         auto rv = WSAStartup(MAKEWORD(2, 2), &wsaData);
-        if (rv != 0)
+        if (rv != 0) {
-        {
             throw_winsock_error_("WSAStartup failed", ::WSAGetLastError());
         }
     }
 
-    static void throw_winsock_error_(const std::string &msg, int last_error)
+    static void throw_winsock_error_(const std::string &msg, int last_error) {
-    {
         char buf[512];
-        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error,
+        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL);
+                         last_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf,
+                         (sizeof(buf) / sizeof(char)), NULL);
 
         throw_spdlog_ex(fmt_lib::format("tcp_sink - {}: {}", msg, buf));
     }
 
 public:
-    tcp_client()
+    tcp_client() { init_winsock_(); }
-    {
-        init_winsock_();
-    }
 
-    ~tcp_client()
+    ~tcp_client() {
-    {
         close();
         ::WSACleanup();
     }
 
-    bool is_connected() const
+    bool is_connected() const { return socket_ != INVALID_SOCKET; }
-    {
-        return socket_ != INVALID_SOCKET;
-    }
 
-    void close()
+    void close() {
-    {
         ::closesocket(socket_);
         socket_ = INVALID_SOCKET;
     }
 
-    SOCKET fd() const
+    SOCKET fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
     // try to connect or throw on failure
-    void connect(const std::string &host, int port)
+    void connect(const std::string &host, int port) {
-    {
+        if (is_connected()) {
-        if (is_connected())
-        {
             close();
         }
-        struct addrinfo hints
+        struct addrinfo hints {};
-        {};
         ZeroMemory(&hints, sizeof(hints));
 
-        hints.ai_family = AF_UNSPEC;     // To work with IPv4, IPv6, and so on
+        hints.ai_family = AF_UNSPEC;      // To work with IPv4, IPv6, and so on
-        hints.ai_socktype = SOCK_STREAM; // TCP
+        hints.ai_socktype = SOCK_STREAM;  // TCP
-        hints.ai_flags = AI_NUMERICSERV; // port passed as as numeric value
+        hints.ai_flags = AI_NUMERICSERV;  // port passed as as numeric value
         hints.ai_protocol = 0;
 
         auto port_str = std::to_string(port);
         struct addrinfo *addrinfo_result;
         auto rv = ::getaddrinfo(host.c_str(), port_str.c_str(), &hints, &addrinfo_result);
         int last_error = 0;
-        if (rv != 0)
+        if (rv != 0) {
-        {
             last_error = ::WSAGetLastError();
             WSACleanup();
             throw_winsock_error_("getaddrinfo failed", last_error);
@@ -101,54 +83,47 @@ public:
 
         // Try each address until we successfully connect(2).
 
-        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next)
+        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next) {
-        {
             socket_ = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-            if (socket_ == INVALID_SOCKET)
+            if (socket_ == INVALID_SOCKET) {
-            {
                 last_error = ::WSAGetLastError();
                 WSACleanup();
                 continue;
             }
-            if (::connect(socket_, rp->ai_addr, (int)rp->ai_addrlen) == 0)
+            if (::connect(socket_, rp->ai_addr, (int)rp->ai_addrlen) == 0) {
-            {
                 break;
-            }
+            } else {
-            else
-            {
                 last_error = ::WSAGetLastError();
                 close();
             }
         }
         ::freeaddrinfo(addrinfo_result);
-        if (socket_ == INVALID_SOCKET)
+        if (socket_ == INVALID_SOCKET) {
-        {
             WSACleanup();
             throw_winsock_error_("connect failed", last_error);
         }
 
         // set TCP_NODELAY
         int enable_flag = 1;
-        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag), sizeof(enable_flag));
+        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag),
+                     sizeof(enable_flag));
     }
 
     // Send exactly n_bytes of the given data.
     // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         size_t bytes_sent = 0;
-        while (bytes_sent < n_bytes)
+        while (bytes_sent < n_bytes) {
-        {
             const int send_flags = 0;
-            auto write_result = ::send(socket_, data + bytes_sent, (int)(n_bytes - bytes_sent), send_flags);
+            auto write_result =
-            if (write_result == SOCKET_ERROR)
+                ::send(socket_, data + bytes_sent, (int)(n_bytes - bytes_sent), send_flags);
-            {
+            if (write_result == SOCKET_ERROR) {
                 int last_error = ::WSAGetLastError();
                 close();
                 throw_winsock_error_("send failed", last_error);
             }
 
-            if (write_result == 0) // (probably should not happen but in any case..)
+            if (write_result == 0)  // (probably should not happen but in any case..)
             {
                 break;
             }
@@ -156,5 +131,5 @@ public:
         }
     }
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/tcp_client.h

@@ -4,91 +4,73 @@
 #pragma once
 
 #ifdef _WIN32
-#    error include tcp_client-windows.h instead
+    #error include tcp_client-windows.h instead
 #endif
 
 // tcp client helper
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
 
-#include <sys/socket.h>
 #include <arpa/inet.h>
-#include <unistd.h>
 #include <netdb.h>
-#include <netinet/tcp.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/socket.h>
+#include <unistd.h>
 
 #include <string>
 
 namespace spdlog {
 namespace details {
-class tcp_client
+class tcp_client {
-{
     int socket_ = -1;
 
 public:
-    bool is_connected() const
+    bool is_connected() const { return socket_ != -1; }
-    {
-        return socket_ != -1;
-    }
 
-    void close()
+    void close() {
-    {
+        if (is_connected()) {
-        if (is_connected())
-        {
             ::close(socket_);
             socket_ = -1;
         }
     }
 
-    int fd() const
+    int fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
-    ~tcp_client()
+    ~tcp_client() { close(); }
-    {
-        close();
-    }
 
     // try to connect or throw on failure
-    void connect(const std::string &host, int port)
+    void connect(const std::string &host, int port) {
-    {
         close();
-        struct addrinfo hints
+        struct addrinfo hints {};
-        {};
         memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family = AF_UNSPEC;     // To work with IPv4, IPv6, and so on
+        hints.ai_family = AF_UNSPEC;      // To work with IPv4, IPv6, and so on
-        hints.ai_socktype = SOCK_STREAM; // TCP
+        hints.ai_socktype = SOCK_STREAM;  // TCP
-        hints.ai_flags = AI_NUMERICSERV; // port passed as as numeric value
+        hints.ai_flags = AI_NUMERICSERV;  // port passed as as numeric value
         hints.ai_protocol = 0;
 
         auto port_str = std::to_string(port);
         struct addrinfo *addrinfo_result;
         auto rv = ::getaddrinfo(host.c_str(), port_str.c_str(), &hints, &addrinfo_result);
-        if (rv != 0)
+        if (rv != 0) {
-        {
             throw_spdlog_ex(fmt_lib::format("::getaddrinfo failed: {}", gai_strerror(rv)));
         }
 
         // Try each address until we successfully connect(2).
         int last_errno = 0;
-        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next)
+        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next) {
-        {
 #if defined(SOCK_CLOEXEC)
             const int flags = SOCK_CLOEXEC;
 #else
             const int flags = 0;
 #endif
             socket_ = ::socket(rp->ai_family, rp->ai_socktype | flags, rp->ai_protocol);
-            if (socket_ == -1)
+            if (socket_ == -1) {
-            {
                 last_errno = errno;
                 continue;
             }
             rv = ::connect(socket_, rp->ai_addr, rp->ai_addrlen);
-            if (rv == 0)
+            if (rv == 0) {
-            {
                 break;
             }
             last_errno = errno;
@@ -96,45 +78,44 @@ public:
             socket_ = -1;
         }
         ::freeaddrinfo(addrinfo_result);
-        if (socket_ == -1)
+        if (socket_ == -1) {
-        {
             throw_spdlog_ex("::connect failed", last_errno);
         }
 
         // set TCP_NODELAY
         int enable_flag = 1;
-        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag), sizeof(enable_flag));
+        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag),
+                     sizeof(enable_flag));
 
         // prevent sigpipe on systems where MSG_NOSIGNAL is not available
 #if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
-        ::setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, reinterpret_cast<char *>(&enable_flag), sizeof(enable_flag));
+        ::setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, reinterpret_cast<char *>(&enable_flag),
+                     sizeof(enable_flag));
 #endif
 
 #if !defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
-#    error "tcp_sink would raise SIGPIPE since neither SO_NOSIGPIPE nor MSG_NOSIGNAL are available"
+    #error "tcp_sink would raise SIGPIPE since neither SO_NOSIGPIPE nor MSG_NOSIGNAL are available"
 #endif
     }
 
     // Send exactly n_bytes of the given data.
     // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         size_t bytes_sent = 0;
-        while (bytes_sent < n_bytes)
+        while (bytes_sent < n_bytes) {
-        {
 #if defined(MSG_NOSIGNAL)
             const int send_flags = MSG_NOSIGNAL;
 #else
             const int send_flags = 0;
 #endif
-            auto write_result = ::send(socket_, data + bytes_sent, n_bytes - bytes_sent, send_flags);
+            auto write_result =
-            if (write_result < 0)
+                ::send(socket_, data + bytes_sent, n_bytes - bytes_sent, send_flags);
-            {
+            if (write_result < 0) {
                 close();
                 throw_spdlog_ex("write(2) failed", errno);
             }
 
-            if (write_result == 0) // (probably should not happen but in any case..)
+            if (write_result == 0)  // (probably should not happen but in any case..)
             {
                 break;
             }
@@ -142,5 +123,5 @@ public:
         }
     }
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/thread_pool-inl.h

@@ -4,26 +4,26 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/thread_pool.h>
+    #include <spdlog/details/thread_pool.h>
 #endif
 
-#include <spdlog/common.h>
 #include <cassert>
+#include <spdlog/common.h>
 
 namespace spdlog {
 namespace details {
 
-SPDLOG_INLINE thread_pool::thread_pool(
+SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items,
-    size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start, std::function<void()> on_thread_stop)
+                                       size_t threads_n,
-    : q_(q_max_items)
+                                       std::function<void()> on_thread_start,
-{
+                                       std::function<void()> on_thread_stop)
-    if (threads_n == 0 || threads_n > 1000)
+    : q_(q_max_items) {
-    {
+    if (threads_n == 0 || threads_n > 1000) {
-        throw_spdlog_ex("spdlog::thread_pool(): invalid threads_n param (valid "
+        throw_spdlog_ex(
-                        "range is 1-1000)");
+            "spdlog::thread_pool(): invalid threads_n param (valid "
+            "range is 1-1000)");
     }
-    for (size_t i = 0; i < threads_n; i++)
+    for (size_t i = 0; i < threads_n; i++) {
-    {
         threads_.emplace_back([this, on_thread_start, on_thread_stop] {
             on_thread_start();
             this->thread_pool::worker_loop_();
@@ -32,106 +32,96 @@ SPDLOG_INLINE thread_pool::thread_pool(
     }
 }
 
-SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start)
+SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items,
-    : thread_pool(q_max_items, threads_n, on_thread_start, [] {})
+                                       size_t threads_n,
-{}
+                                       std::function<void()> on_thread_start)
+    : thread_pool(q_max_items, threads_n, on_thread_start, [] {}) {}
 
 SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n)
     : thread_pool(
-          q_max_items, threads_n, [] {}, [] {})
+          q_max_items, threads_n, [] {}, [] {}) {}
-{}
 
 // message all threads to terminate gracefully join them
-SPDLOG_INLINE thread_pool::~thread_pool()
+SPDLOG_INLINE thread_pool::~thread_pool() {
-{
+    SPDLOG_TRY {
-    SPDLOG_TRY
+        for (size_t i = 0; i < threads_.size(); i++) {
-    {
-        for (size_t i = 0; i < threads_.size(); i++)
-        {
             post_async_msg_(async_msg(async_msg_type::terminate), async_overflow_policy::block);
         }
 
-        for (auto &t : threads_)
+        for (auto &t : threads_) {
-        {
             t.join();
         }
     }
     SPDLOG_CATCH_STD
 }
 
-void SPDLOG_INLINE thread_pool::post_log(async_logger_ptr &&worker_ptr, const details::log_msg &msg, async_overflow_policy overflow_policy)
+void SPDLOG_INLINE thread_pool::post_log(async_logger_ptr &&worker_ptr,
-{
+                                         const details::log_msg &msg,
+                                         async_overflow_policy overflow_policy) {
     async_msg async_m(std::move(worker_ptr), async_msg_type::log, msg);
     post_async_msg_(std::move(async_m), overflow_policy);
 }
 
-void SPDLOG_INLINE thread_pool::post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy)
+void SPDLOG_INLINE thread_pool::post_flush(async_logger_ptr &&worker_ptr,
-{
+                                           async_overflow_policy overflow_policy) {
     post_async_msg_(async_msg(std::move(worker_ptr), async_msg_type::flush), overflow_policy);
 }
 
-size_t SPDLOG_INLINE thread_pool::overrun_counter()
+size_t SPDLOG_INLINE thread_pool::overrun_counter() { return q_.overrun_counter(); }
-{
-    return q_.overrun_counter();
-}
 
-void SPDLOG_INLINE thread_pool::reset_overrun_counter()
+void SPDLOG_INLINE thread_pool::reset_overrun_counter() { q_.reset_overrun_counter(); }
-{
-    q_.reset_overrun_counter();
-}
 
-size_t SPDLOG_INLINE thread_pool::queue_size()
+size_t SPDLOG_INLINE thread_pool::discard_counter() { return q_.discard_counter(); }
-{
-    return q_.size();
-}
 
-void SPDLOG_INLINE thread_pool::post_async_msg_(async_msg &&new_msg, async_overflow_policy overflow_policy)
+void SPDLOG_INLINE thread_pool::reset_discard_counter() { q_.reset_discard_counter(); }
-{
+
-    if (overflow_policy == async_overflow_policy::block)
+size_t SPDLOG_INLINE thread_pool::queue_size() { return q_.size(); }
-    {
+
+void SPDLOG_INLINE thread_pool::post_async_msg_(async_msg &&new_msg,
+                                                async_overflow_policy overflow_policy) {
+    if (overflow_policy == async_overflow_policy::block) {
         q_.enqueue(std::move(new_msg));
-    }
+    } else if (overflow_policy == async_overflow_policy::overrun_oldest) {
-    else
-    {
         q_.enqueue_nowait(std::move(new_msg));
+    } else {
+        assert(overflow_policy == async_overflow_policy::discard_new);
+        q_.enqueue_if_have_room(std::move(new_msg));
     }
 }
 
-void SPDLOG_INLINE thread_pool::worker_loop_()
+void SPDLOG_INLINE thread_pool::worker_loop_() {
-{
+    while (process_next_msg_()) {
-    while (process_next_msg_()) {}
+    }
 }
 
 // process next message in the queue
 // return true if this thread should still be active (while no terminate msg
 // was received)
-bool SPDLOG_INLINE thread_pool::process_next_msg_()
+bool SPDLOG_INLINE thread_pool::process_next_msg_() {
-{
     async_msg incoming_async_msg;
     q_.dequeue(incoming_async_msg);
 
-    switch (incoming_async_msg.msg_type)
+    switch (incoming_async_msg.msg_type) {
-    {
+        case async_msg_type::log: {
-    case async_msg_type::log: {
+            incoming_async_msg.worker_ptr->backend_sink_it_(incoming_async_msg);
-        incoming_async_msg.worker_ptr->backend_sink_it_(incoming_async_msg);
+            return true;
-        return true;
+        }
-    }
+        case async_msg_type::flush: {
-    case async_msg_type::flush: {
+            incoming_async_msg.worker_ptr->backend_flush_();
-        incoming_async_msg.worker_ptr->backend_flush_();
+            return true;
-        return true;
+        }
-    }
 
-    case async_msg_type::terminate: {
+        case async_msg_type::terminate: {
-        return false;
+            return false;
-    }
+        }
 
-    default: {
+        default: {
-        assert(false);
+            assert(false);
-    }
+        }
     }
 
     return true;
 }
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/thread_pool.h

@@ -8,10 +8,10 @@
 #include <spdlog/details/os.h>
 
 #include <chrono>
+#include <functional>
 #include <memory>
 #include <thread>
 #include <vector>
-#include <functional>
 
 namespace spdlog {
 class async_logger;
@@ -20,17 +20,11 @@ namespace details {
 
 using async_logger_ptr = std::shared_ptr<spdlog::async_logger>;
 
-enum class async_msg_type
+enum class async_msg_type { log, flush, terminate };
-{
-    log,
-    flush,
-    terminate
-};
 
 // Async msg to move to/from the queue
 // Movable only. should never be copied
-struct async_msg : log_msg_buffer
+struct async_msg : log_msg_buffer {
-{
     async_msg_type msg_type{async_msg_type::log};
     async_logger_ptr worker_ptr;
 
@@ -43,48 +37,45 @@ struct async_msg : log_msg_buffer
 // support for vs2013 move
 #if defined(_MSC_VER) && _MSC_VER <= 1800
     async_msg(async_msg &&other)
-        : log_msg_buffer(std::move(other))
+        : log_msg_buffer(std::move(other)),
-        , msg_type(other.msg_type)
+          msg_type(other.msg_type),
-        , worker_ptr(std::move(other.worker_ptr))
+          worker_ptr(std::move(other.worker_ptr)) {}
-    {}
 
-    async_msg &operator=(async_msg &&other)
+    async_msg &operator=(async_msg &&other) {
-    {
         *static_cast<log_msg_buffer *>(this) = std::move(other);
         msg_type = other.msg_type;
         worker_ptr = std::move(other.worker_ptr);
         return *this;
     }
-#else // (_MSC_VER) && _MSC_VER <= 1800
+#else  // (_MSC_VER) && _MSC_VER <= 1800
     async_msg(async_msg &&) = default;
     async_msg &operator=(async_msg &&) = default;
 #endif
 
     // construct from log_msg with given type
     async_msg(async_logger_ptr &&worker, async_msg_type the_type, const details::log_msg &m)
-        : log_msg_buffer{m}
+        : log_msg_buffer{m},
-        , msg_type{the_type}
+          msg_type{the_type},
-        , worker_ptr{std::move(worker)}
+          worker_ptr{std::move(worker)} {}
-    {}
 
     async_msg(async_logger_ptr &&worker, async_msg_type the_type)
-        : log_msg_buffer{}
+        : log_msg_buffer{},
-        , msg_type{the_type}
+          msg_type{the_type},
-        , worker_ptr{std::move(worker)}
+          worker_ptr{std::move(worker)} {}
-    {}
 
     explicit async_msg(async_msg_type the_type)
-        : async_msg{nullptr, the_type}
+        : async_msg{nullptr, the_type} {}
-    {}
 };
 
-class SPDLOG_API thread_pool
+class SPDLOG_API thread_pool {
-{
 public:
     using item_type = async_msg;
     using q_type = details::mpmc_blocking_queue<item_type>;
 
-    thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start, std::function<void()> on_thread_stop);
+    thread_pool(size_t q_max_items,
+                size_t threads_n,
+                std::function<void()> on_thread_start,
+                std::function<void()> on_thread_stop);
     thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start);
     thread_pool(size_t q_max_items, size_t threads_n);
 
@@ -94,10 +85,14 @@ public:
     thread_pool(const thread_pool &) = delete;
     thread_pool &operator=(thread_pool &&) = delete;
 
-    void post_log(async_logger_ptr &&worker_ptr, const details::log_msg &msg, async_overflow_policy overflow_policy);
+    void post_log(async_logger_ptr &&worker_ptr,
+                  const details::log_msg &msg,
+                  async_overflow_policy overflow_policy);
     void post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy);
     size_t overrun_counter();
     void reset_overrun_counter();
+    size_t discard_counter();
+    void reset_discard_counter();
     size_t queue_size();
 
 private:
@@ -114,9 +109,9 @@ private:
     bool process_next_msg_();
 };
 
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "thread_pool-inl.h"
+    #include "thread_pool-inl.h"
 #endif

include/spdlog/details/udp_client-windows.h

@@ -9,49 +9,44 @@
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
 #include <spdlog/details/windows_include.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
 
 #if defined(_MSC_VER)
-#    pragma comment(lib, "Ws2_32.lib")
+    #pragma comment(lib, "Ws2_32.lib")
-#    pragma comment(lib, "Mswsock.lib")
+    #pragma comment(lib, "Mswsock.lib")
-#    pragma comment(lib, "AdvApi32.lib")
+    #pragma comment(lib, "AdvApi32.lib")
 #endif
 
 namespace spdlog {
 namespace details {
-class udp_client
+class udp_client {
-{
     static constexpr int TX_BUFFER_SIZE = 1024 * 10;
     SOCKET socket_ = INVALID_SOCKET;
     sockaddr_in addr_ = {};
 
-    static void init_winsock_()
+    static void init_winsock_() {
-    {
         WSADATA wsaData;
         auto rv = ::WSAStartup(MAKEWORD(2, 2), &wsaData);
-        if (rv != 0)
+        if (rv != 0) {
-        {
             throw_winsock_error_("WSAStartup failed", ::WSAGetLastError());
         }
     }
 
-    static void throw_winsock_error_(const std::string &msg, int last_error)
+    static void throw_winsock_error_(const std::string &msg, int last_error) {
-    {
         char buf[512];
-        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error,
+        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL);
+                         last_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf,
+                         (sizeof(buf) / sizeof(char)), NULL);
 
         throw_spdlog_ex(fmt_lib::format("udp_sink - {}: {}", msg, buf));
     }
 
-    void cleanup_()
+    void cleanup_() {
-    {
+        if (socket_ != INVALID_SOCKET) {
-        if (socket_ != INVALID_SOCKET)
-        {
             ::closesocket(socket_);
         }
         socket_ = INVALID_SOCKET;
@@ -59,55 +54,45 @@ class udp_client
     }
 
 public:
-    udp_client(const std::string &host, uint16_t port)
+    udp_client(const std::string &host, uint16_t port) {
-    {
         init_winsock_();
 
         addr_.sin_family = PF_INET;
         addr_.sin_port = htons(port);
         addr_.sin_addr.s_addr = INADDR_ANY;
-        if (InetPtonA(PF_INET, host.c_str(), &addr_.sin_addr.s_addr) != 1)
+        if (InetPtonA(PF_INET, host.c_str(), &addr_.sin_addr.s_addr) != 1) {
-        {
             int last_error = ::WSAGetLastError();
             ::WSACleanup();
             throw_winsock_error_("error: Invalid address!", last_error);
         }
 
         socket_ = ::socket(PF_INET, SOCK_DGRAM, 0);
-        if (socket_ == INVALID_SOCKET)
+        if (socket_ == INVALID_SOCKET) {
-        {
             int last_error = ::WSAGetLastError();
             ::WSACleanup();
             throw_winsock_error_("error: Create Socket failed", last_error);
         }
 
         int option_value = TX_BUFFER_SIZE;
-        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0)
+        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF,
-        {
+                         reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0) {
             int last_error = ::WSAGetLastError();
             cleanup_();
             throw_winsock_error_("error: setsockopt(SO_SNDBUF) Failed!", last_error);
         }
     }
 
-    ~udp_client()
+    ~udp_client() { cleanup_(); }
-    {
-        cleanup_();
-    }
 
-    SOCKET fd() const
+    SOCKET fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         socklen_t tolen = sizeof(struct sockaddr);
-        if (::sendto(socket_, data, static_cast<int>(n_bytes), 0, (struct sockaddr *)&addr_, tolen) == -1)
+        if (::sendto(socket_, data, static_cast<int>(n_bytes), 0, (struct sockaddr *)&addr_,
-        {
+                     tolen) == -1) {
             throw_spdlog_ex("sendto(2) failed", errno);
         }
     }
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/udp_client.h

@@ -7,51 +7,46 @@
 // Will throw on construction if the socket creation failed.
 
 #ifdef _WIN32
-#    error "include udp_client-windows.h instead"
+    #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 <spdlog/common.h>
 #include <spdlog/details/os.h>
-#include <cstring>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <unistd.h>
-#include <netdb.h>
-#include <netinet/udp.h>
 
 #include <string>
 
 namespace spdlog {
 namespace details {
 
-class udp_client
+class udp_client {
-{
     static constexpr int TX_BUFFER_SIZE = 1024 * 10;
     int socket_ = -1;
     struct sockaddr_in sockAddr_;
 
-    void cleanup_()
+    void cleanup_() {
-    {
+        if (socket_ != -1) {
-        if (socket_ != -1)
-        {
             ::close(socket_);
             socket_ = -1;
         }
     }
 
 public:
-    udp_client(const std::string &host, uint16_t port)
+    udp_client(const std::string &host, uint16_t port) {
-    {
         socket_ = ::socket(PF_INET, SOCK_DGRAM, 0);
-        if (socket_ < 0)
+        if (socket_ < 0) {
-        {
             throw_spdlog_ex("error: Create Socket Failed!");
         }
 
         int option_value = TX_BUFFER_SIZE;
-        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0)
+        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF,
-        {
+                         reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0) {
             cleanup_();
             throw_spdlog_ex("error: setsockopt(SO_SNDBUF) Failed!");
         }
@@ -59,8 +54,7 @@ public:
         sockAddr_.sin_family = AF_INET;
         sockAddr_.sin_port = htons(port);
 
-        if (::inet_aton(host.c_str(), &sockAddr_.sin_addr) == 0)
+        if (::inet_aton(host.c_str(), &sockAddr_.sin_addr) == 0) {
-        {
             cleanup_();
             throw_spdlog_ex("error: Invalid address!");
         }
@@ -68,27 +62,20 @@ public:
         ::memset(sockAddr_.sin_zero, 0x00, sizeof(sockAddr_.sin_zero));
     }
 
-    ~udp_client()
+    ~udp_client() { cleanup_(); }
-    {
-        cleanup_();
-    }
 
-    int fd() const
+    int fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
     // Send exactly n_bytes of the given data.
     // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         ssize_t toslen = 0;
         socklen_t tolen = sizeof(struct sockaddr);
-        if ((toslen = ::sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&sockAddr_, tolen)) == -1)
+        if ((toslen = ::sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&sockAddr_, tolen)) ==
-        {
+            -1) {
             throw_spdlog_ex("sendto(2) failed", errno);
         }
     }
 };
-} // namespace details
+}  // namespace details
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/details/windows_include.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #ifndef NOMINMAX
-#    define NOMINMAX // prevent windows redefining min/max
+    #define NOMINMAX  // prevent windows redefining min/max
 #endif
 
 #ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
 #endif
 
 #include <windows.h>

include/spdlog/fmt/bin_to_hex.h

@@ -9,13 +9,13 @@
 #include <spdlog/common.h>
 
 #if defined(__has_include)
-#    if __has_include(<version>)
+    #if __has_include(<version>)
-#        include <version>
+        #include <version>
-#    endif
+    #endif
 #endif
 
 #if __cpp_lib_span >= 202002L
-#    include <span>
+    #include <span>
 #endif
 
 //
@@ -39,53 +39,43 @@
 namespace spdlog {
 namespace details {
 
-template<typename It>
+template <typename It>
-class dump_info
+class dump_info {
-{
 public:
     dump_info(It range_begin, It range_end, size_t size_per_line)
-        : begin_(range_begin)
+        : begin_(range_begin),
-        , end_(range_end)
+          end_(range_end),
-        , size_per_line_(size_per_line)
+          size_per_line_(size_per_line) {}
-    {}
 
     // do not use begin() and end() to avoid collision with fmt/ranges
-    It get_begin() const
+    It get_begin() const { return begin_; }
-    {
+    It get_end() const { return end_; }
-        return begin_;
+    size_t size_per_line() const { return size_per_line_; }
-    }
-    It get_end() const
-    {
-        return end_;
-    }
-    size_t size_per_line() const
-    {
-        return size_per_line_;
-    }
 
 private:
     It begin_, end_;
     size_t size_per_line_;
 };
-} // namespace details
+}  // namespace details
 
 // create a dump_info that wraps the given container
-template<typename Container>
+template <typename Container>
-inline details::dump_info<typename Container::const_iterator> to_hex(const Container &container, size_t size_per_line = 32)
+inline details::dump_info<typename Container::const_iterator> to_hex(const Container &container,
-{
+                                                                     size_t size_per_line = 32) {
-    static_assert(sizeof(typename Container::value_type) == 1, "sizeof(Container::value_type) != 1");
+    static_assert(sizeof(typename Container::value_type) == 1,
+                  "sizeof(Container::value_type) != 1");
     using Iter = typename Container::const_iterator;
     return details::dump_info<Iter>(std::begin(container), std::end(container), size_per_line);
 }
 
 #if __cpp_lib_span >= 202002L
 
-template<typename Value, size_t Extent>
+template <typename Value, size_t Extent>
 inline details::dump_info<typename std::span<Value, Extent>::iterator> to_hex(
-    const std::span<Value, Extent> &container, size_t size_per_line = 32)
+    const std::span<Value, Extent> &container, size_t size_per_line = 32) {
-{
     using Container = std::span<Value, Extent>;
-    static_assert(sizeof(typename Container::value_type) == 1, "sizeof(Container::value_type) != 1");
+    static_assert(sizeof(typename Container::value_type) == 1,
+                  "sizeof(Container::value_type) != 1");
     using Iter = typename Container::iterator;
     return details::dump_info<Iter>(std::begin(container), std::end(container), size_per_line);
 }
@@ -93,13 +83,14 @@ inline details::dump_info<typename std::span<Value, Extent>::iterator> to_hex(
 #endif
 
 // create dump_info from ranges
-template<typename It>
+template <typename It>
-inline details::dump_info<It> to_hex(const It range_begin, const It range_end, size_t size_per_line = 32)
+inline details::dump_info<It> to_hex(const It range_begin,
-{
+                                     const It range_end,
+                                     size_t size_per_line = 32) {
     return details::dump_info<It>(range_begin, range_end, size_per_line);
 }
 
-} // namespace spdlog
+}  // namespace spdlog
 
 namespace
 #ifdef SPDLOG_USE_STD_FORMAT
@@ -109,44 +100,39 @@ namespace
 #endif
 {
 
-template<typename T>
+template <typename T>
-struct formatter<spdlog::details::dump_info<T>, char>
+struct formatter<spdlog::details::dump_info<T>, char> {
-{
     const char delimiter = ' ';
     bool put_newlines = true;
     bool put_delimiters = true;
     bool use_uppercase = false;
-    bool put_positions = true; // position on start of each line
+    bool put_positions = true;  // position on start of each line
     bool show_ascii = false;
 
     // parse the format string flags
-    template<typename ParseContext>
+    template <typename ParseContext>
-    SPDLOG_CONSTEXPR_FUNC auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+    SPDLOG_CONSTEXPR_FUNC auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
-    {
         auto it = ctx.begin();
-        while (it != ctx.end() && *it != '}')
+        while (it != ctx.end() && *it != '}') {
-        {
+            switch (*it) {
-            switch (*it)
+                case 'X':
-            {
+                    use_uppercase = true;
-            case 'X':
+                    break;
-                use_uppercase = true;
+                case 's':
-                break;
+                    put_delimiters = false;
-            case 's':
+                    break;
-                put_delimiters = false;
+                case 'p':
-                break;
+                    put_positions = false;
-            case 'p':
+                    break;
-                put_positions = false;
+                case 'n':
-                break;
+                    put_newlines = false;
-            case 'n':
+                    show_ascii = false;
-                put_newlines = false;
+                    break;
-                show_ascii = false;
+                case 'a':
-                break;
+                    if (put_newlines) {
-            case 'a':
+                        show_ascii = true;
-                if (put_newlines)
+                    }
-                {
+                    break;
-                    show_ascii = true;
-                }
-                break;
             }
 
             ++it;
@@ -155,9 +141,9 @@ struct formatter<spdlog::details::dump_info<T>, char>
     }
 
     // format the given bytes range as hex
-    template<typename FormatContext, typename Container>
+    template <typename FormatContext, typename Container>
-    auto format(const spdlog::details::dump_info<Container> &the_range, FormatContext &ctx) const -> decltype(ctx.out())
+    auto format(const spdlog::details::dump_info<Container> &the_range, FormatContext &ctx) const
-    {
+        -> decltype(ctx.out()) {
         SPDLOG_CONSTEXPR const char *hex_upper = "0123456789ABCDEF";
         SPDLOG_CONSTEXPR const char *hex_lower = "0123456789abcdef";
         const char *hex_chars = use_uppercase ? hex_upper : hex_lower;
@@ -170,18 +156,15 @@ struct formatter<spdlog::details::dump_info<T>, char>
 
         int size_per_line = static_cast<int>(the_range.size_per_line());
         auto start_of_line = the_range.get_begin();
-        for (auto i = the_range.get_begin(); i != the_range.get_end(); i++)
+        for (auto i = the_range.get_begin(); i != the_range.get_end(); i++) {
-        {
             auto ch = static_cast<unsigned char>(*i);
 
-            if (put_newlines && (i == the_range.get_begin() || i - start_of_line >= size_per_line))
+            if (put_newlines &&
-            {
+                (i == the_range.get_begin() || i - start_of_line >= size_per_line)) {
-                if (show_ascii && i != the_range.get_begin())
+                if (show_ascii && i != the_range.get_begin()) {
-                {
                     *inserter++ = delimiter;
                     *inserter++ = delimiter;
-                    for (auto j = start_of_line; j < i; j++)
+                    for (auto j = start_of_line; j < i; j++) {
-                    {
                         auto pc = static_cast<unsigned char>(*j);
                         *inserter++ = std::isprint(pc) ? static_cast<char>(*j) : '.';
                     }
@@ -196,33 +179,28 @@ struct formatter<spdlog::details::dump_info<T>, char>
                 continue;
             }
 
-            if (put_delimiters && i != the_range.get_begin())
+            if (put_delimiters && i != the_range.get_begin()) {
-            {
                 *inserter++ = delimiter;
             }
 
             *inserter++ = hex_chars[(ch >> 4) & 0x0f];
             *inserter++ = hex_chars[ch & 0x0f];
         }
-        if (show_ascii) // add ascii to last line
+        if (show_ascii)  // add ascii to last line
         {
-            if (the_range.get_end() - the_range.get_begin() > size_per_line)
+            if (the_range.get_end() - the_range.get_begin() > size_per_line) {
-            {
                 auto blank_num = size_per_line - (the_range.get_end() - start_of_line);
-                while (blank_num-- > 0)
+                while (blank_num-- > 0) {
-                {
                     *inserter++ = delimiter;
                     *inserter++ = delimiter;
-                    if (put_delimiters)
+                    if (put_delimiters) {
-                    {
                         *inserter++ = delimiter;
                     }
                 }
             }
             *inserter++ = delimiter;
             *inserter++ = delimiter;
-            for (auto j = start_of_line; j != the_range.get_end(); j++)
+            for (auto j = start_of_line; j != the_range.get_end(); j++) {
-            {
                 auto pc = static_cast<unsigned char>(*j);
                 *inserter++ = std::isprint(pc) ? static_cast<char>(*j) : '.';
             }
@@ -231,18 +209,16 @@ struct formatter<spdlog::details::dump_info<T>, char>
     }
 
     // put newline(and position header)
-    template<typename It>
+    template <typename It>
-    void put_newline(It inserter, std::size_t pos) const
+    void put_newline(It inserter, std::size_t pos) const {
-    {
 #ifdef _WIN32
         *inserter++ = '\r';
 #endif
         *inserter++ = '\n';
 
-        if (put_positions)
+        if (put_positions) {
-        {
             spdlog::fmt_lib::format_to(inserter, SPDLOG_FMT_STRING("{:04X}: "), pos);
         }
     }
 };
-} // namespace std
+}  // namespace std

include/spdlog/fmt/chrono.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's chrono support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/chrono.h>
+        #include <spdlog/fmt/bundled/chrono.h>
-#    else
+    #else
-#        include <fmt/chrono.h>
+        #include <fmt/chrono.h>
-#    endif
+    #endif
 #endif

include/spdlog/fmt/compile.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's compile-time support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/compile.h>
+        #include <spdlog/fmt/bundled/compile.h>
-#    else
+    #else
-#        include <fmt/compile.h>
+        #include <fmt/compile.h>
-#    endif
+    #endif
 #endif

include/spdlog/fmt/fmt.h

@@ -9,25 +9,26 @@
 // Include a bundled header-only copy of fmtlib or an external one.
 // By default spdlog include its own copy.
 //
+#include <spdlog/tweakme.h>
 
-#if defined(SPDLOG_USE_STD_FORMAT) // SPDLOG_USE_STD_FORMAT is defined - use std::format
+#if defined(SPDLOG_USE_STD_FORMAT)  // SPDLOG_USE_STD_FORMAT is defined - use std::format
-#    include <format>
+    #include <format>
 #elif !defined(SPDLOG_FMT_EXTERNAL)
-#    if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
+    #if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
-#        define FMT_HEADER_ONLY
+        #define FMT_HEADER_ONLY
-#    endif
+    #endif
-#    ifndef FMT_USE_WINDOWS_H
+    #ifndef FMT_USE_WINDOWS_H
-#        define FMT_USE_WINDOWS_H 0
+        #define FMT_USE_WINDOWS_H 0
-#    endif
+    #endif
-// enable the 'n' flag in for backward compatibility with fmt 6.x
+    // enable the 'n' flag in for backward compatibility with fmt 6.x
-#    define FMT_DEPRECATED_N_SPECIFIER
+    #define FMT_DEPRECATED_N_SPECIFIER
-// enable ostream formatting for backward compatibility with fmt 8.x
+    // enable ostream formatting for backward compatibility with fmt 8.x
-#    define FMT_DEPRECATED_OSTREAM
+    #define FMT_DEPRECATED_OSTREAM
 
-#    include <spdlog/fmt/bundled/core.h>
+    #include <spdlog/fmt/bundled/core.h>
-#    include <spdlog/fmt/bundled/format.h>
+    #include <spdlog/fmt/bundled/format.h>
 
-#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
+#else  // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-#    include <fmt/core.h>
+    #include <fmt/core.h>
-#    include <fmt/format.h>
+    #include <fmt/format.h>
 #endif

include/spdlog/fmt/ostr.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's ostream support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/ostream.h>
+        #include <spdlog/fmt/bundled/ostream.h>
-#    else
+    #else
-#        include <fmt/ostream.h>
+        #include <fmt/ostream.h>
-#    endif
+    #endif
 #endif

include/spdlog/fmt/ranges.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's ranges support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/ranges.h>
+        #include <spdlog/fmt/bundled/ranges.h>
-#    else
+    #else
-#        include <fmt/ranges.h>
+        #include <fmt/ranges.h>
-#    endif
+    #endif
 #endif

include/spdlog/fmt/std.h

@@ -5,19 +5,20 @@
 
 #pragma once
 //
-// include bundled or external copy of fmtlib's std support (for formatting e.g. std::filesystem::path, std::thread::id, std::monostate,
+// include bundled or external copy of fmtlib's std support (for formatting e.g.
-// std::variant, ...)
+// std::filesystem::path, std::thread::id, std::monostate, std::variant, ...)
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/std.h>
+        #include <spdlog/fmt/bundled/std.h>
-#    else
+    #else
-#        include <fmt/std.h>
+        #include <fmt/std.h>
-#    endif
+    #endif
 #endif

include/spdlog/fmt/xchar.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's xchar support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/xchar.h>
+        #include <spdlog/fmt/bundled/xchar.h>
-#    else
+    #else
-#        include <fmt/xchar.h>
+        #include <fmt/xchar.h>
-#    endif
+    #endif
 #endif

include/spdlog/formatter.h

@@ -3,16 +3,15 @@
 
 #pragma once
 
-#include <spdlog/fmt/fmt.h>
 #include <spdlog/details/log_msg.h>
+#include <spdlog/fmt/fmt.h>
 
 namespace spdlog {
 
-class formatter
+class formatter {
-{
 public:
     virtual ~formatter() = default;
     virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0;
     virtual std::unique_ptr<formatter> clone() const = 0;
 };
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/fwd.h

@@ -15,4 +15,4 @@ namespace level {
 enum level_enum : int;
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/logger-inl.h

@@ -4,12 +4,12 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/logger.h>
+    #include <spdlog/logger.h>
 #endif
 
-#include <spdlog/sinks/sink.h>
 #include <spdlog/details/backtracer.h>
 #include <spdlog/pattern_formatter.h>
+#include <spdlog/sinks/sink.h>
 
 #include <cstdio>
 
@@ -17,31 +17,29 @@ namespace spdlog {
 
 // public methods
 SPDLOG_INLINE logger::logger(const logger &other)
-    : name_(other.name_)
+    : name_(other.name_),
-    , sinks_(other.sinks_)
+      sinks_(other.sinks_),
-    , level_(other.level_.load(std::memory_order_relaxed))
+      level_(other.level_.load(std::memory_order_relaxed)),
-    , flush_level_(other.flush_level_.load(std::memory_order_relaxed))
+      flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
-    , custom_err_handler_(other.custom_err_handler_)
+      custom_err_handler_(other.custom_err_handler_),
-    , tracer_(other.tracer_)
+      tracer_(other.tracer_) {}
-{}
 
-SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)),
+SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT
-                                                               sinks_(std::move(other.sinks_)),
+    : name_(std::move(other.name_)),
-                                                               level_(other.level_.load(std::memory_order_relaxed)),
+      sinks_(std::move(other.sinks_)),
-                                                               flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
+      level_(other.level_.load(std::memory_order_relaxed)),
-                                                               custom_err_handler_(std::move(other.custom_err_handler_)),
+      flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
-                                                               tracer_(std::move(other.tracer_))
+      custom_err_handler_(std::move(other.custom_err_handler_)),
+      tracer_(std::move(other.tracer_))
 
 {}
 
-SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT {
-{
     this->swap(other);
     return *this;
 }
 
-SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT {
-{
     name_.swap(other.name_);
     sinks_.swap(other.sinks_);
 
@@ -59,179 +57,121 @@ SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT
     std::swap(tracer_, other.tracer_);
 }
 
-SPDLOG_INLINE void swap(logger &a, logger &b)
+SPDLOG_INLINE void swap(logger &a, logger &b) { a.swap(b); }
-{
-    a.swap(b);
-}
 
-SPDLOG_INLINE void logger::set_level(level::level_enum log_level)
+SPDLOG_INLINE void logger::set_level(level::level_enum log_level) { level_.store(log_level); }
-{
-    level_.store(log_level);
-}
 
-SPDLOG_INLINE level::level_enum logger::level() const
+SPDLOG_INLINE level::level_enum logger::level() const {
-{
     return static_cast<level::level_enum>(level_.load(std::memory_order_relaxed));
 }
 
-SPDLOG_INLINE const std::string &logger::name() const
+SPDLOG_INLINE const std::string &logger::name() const { return name_; }
-{
-    return name_;
-}
 
 // set formatting for the sinks in this logger.
 // each sink will get a separate instance of the formatter object.
-SPDLOG_INLINE void logger::set_formatter(std::unique_ptr<formatter> f)
+SPDLOG_INLINE void logger::set_formatter(std::unique_ptr<formatter> f) {
-{
+    for (auto it = sinks_.begin(); it != sinks_.end(); ++it) {
-    for (auto it = sinks_.begin(); it != sinks_.end(); ++it)
+        if (std::next(it) == sinks_.end()) {
-    {
-        if (std::next(it) == sinks_.end())
-        {
             // last element - we can be move it.
             (*it)->set_formatter(std::move(f));
-            break; // to prevent clang-tidy warning
+            break;  // to prevent clang-tidy warning
-        }
+        } else {
-        else
-        {
             (*it)->set_formatter(f->clone());
         }
     }
 }
 
-SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type)
+SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) {
-{
     auto new_formatter = details::make_unique<pattern_formatter>(std::move(pattern), time_type);
     set_formatter(std::move(new_formatter));
 }
 
 // create new backtrace sink and move to it all our child sinks
-SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages)
+SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) { tracer_.enable(n_messages); }
-{
-    tracer_.enable(n_messages);
-}
 
 // restore orig sinks and level and delete the backtrace sink
-SPDLOG_INLINE void logger::disable_backtrace()
+SPDLOG_INLINE void logger::disable_backtrace() { tracer_.disable(); }
-{
-    tracer_.disable();
-}
 
-SPDLOG_INLINE void logger::dump_backtrace()
+SPDLOG_INLINE void logger::dump_backtrace() { dump_backtrace_(); }
-{
-    dump_backtrace_();
-}
 
 // flush functions
-SPDLOG_INLINE void logger::flush()
+SPDLOG_INLINE void logger::flush() { flush_(); }
-{
-    flush_();
-}
 
-SPDLOG_INLINE void logger::flush_on(level::level_enum log_level)
+SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) { flush_level_.store(log_level); }
-{
-    flush_level_.store(log_level);
-}
 
-SPDLOG_INLINE level::level_enum logger::flush_level() const
+SPDLOG_INLINE level::level_enum logger::flush_level() const {
-{
     return static_cast<level::level_enum>(flush_level_.load(std::memory_order_relaxed));
 }
 
 // sinks
-SPDLOG_INLINE const std::vector<sink_ptr> &logger::sinks() const
+SPDLOG_INLINE const std::vector<sink_ptr> &logger::sinks() const { return sinks_; }
-{
-    return sinks_;
-}
 
-SPDLOG_INLINE std::vector<sink_ptr> &logger::sinks()
+SPDLOG_INLINE std::vector<sink_ptr> &logger::sinks() { return sinks_; }
-{
-    return sinks_;
-}
 
 // error handler
-SPDLOG_INLINE void logger::set_error_handler(err_handler handler)
+SPDLOG_INLINE void logger::set_error_handler(err_handler handler) {
-{
     custom_err_handler_ = std::move(handler);
 }
 
 // create new logger with same sinks and configuration.
-SPDLOG_INLINE std::shared_ptr<logger> logger::clone(std::string logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> logger::clone(std::string logger_name) {
-{
     auto cloned = std::make_shared<logger>(*this);
     cloned->name_ = std::move(logger_name);
     return cloned;
 }
 
 // protected methods
-SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled)
+SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg,
-{
+                                   bool log_enabled,
-    if (log_enabled)
+                                   bool traceback_enabled) {
-    {
+    if (log_enabled) {
         sink_it_(log_msg);
     }
-    if (traceback_enabled)
+    if (traceback_enabled) {
-    {
         tracer_.push_back(log_msg);
     }
 }
 
-SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        if (sink->should_log(msg.level)) {
-    {
+            SPDLOG_TRY { sink->log(msg); }
-        if (sink->should_log(msg.level))
-        {
-            SPDLOG_TRY
-            {
-                sink->log(msg);
-            }
             SPDLOG_LOGGER_CATCH(msg.source)
         }
     }
 
-    if (should_flush_(msg))
+    if (should_flush_(msg)) {
-    {
         flush_();
     }
 }
 
-SPDLOG_INLINE void logger::flush_()
+SPDLOG_INLINE void logger::flush_() {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        SPDLOG_TRY { sink->flush(); }
-    {
-        SPDLOG_TRY
-        {
-            sink->flush();
-        }
         SPDLOG_LOGGER_CATCH(source_loc())
     }
 }
 
-SPDLOG_INLINE void logger::dump_backtrace_()
+SPDLOG_INLINE void logger::dump_backtrace_() {
-{
     using details::log_msg;
-    if (tracer_.enabled() && !tracer_.empty())
+    if (tracer_.enabled() && !tracer_.empty()) {
-    {
+        sink_it_(
-        sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"});
+            log_msg{name(), level::info, "****************** Backtrace Start ******************"});
         tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); });
-        sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"});
+        sink_it_(
+            log_msg{name(), level::info, "****************** Backtrace End ********************"});
     }
 }
 
-SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg)
+SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) {
-{
     auto flush_level = flush_level_.load(std::memory_order_relaxed);
     return (msg.level >= flush_level) && (msg.level != level::off);
 }
 
-SPDLOG_INLINE void logger::err_handler_(const std::string &msg)
+SPDLOG_INLINE void logger::err_handler_(const std::string &msg) {
-{
+    if (custom_err_handler_) {
-    if (custom_err_handler_)
-    {
         custom_err_handler_(msg);
-    }
+    } else {
-    else
-    {
         using std::chrono::system_clock;
         static std::mutex mutex;
         static std::chrono::system_clock::time_point last_report_time;
@@ -239,19 +179,20 @@ SPDLOG_INLINE void logger::err_handler_(const std::string &msg)
         std::lock_guard<std::mutex> lk{mutex};
         auto now = system_clock::now();
         err_counter++;
-        if (now - last_report_time < std::chrono::seconds(1))
+        if (now - last_report_time < std::chrono::seconds(1)) {
-        {
             return;
         }
         last_report_time = now;
         auto tm_time = details::os::localtime(system_clock::to_time_t(now));
         char date_buf[64];
         std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time);
-#if defined(USING_R) && defined(R_R_H) // if in R environment
+#if defined(USING_R) && defined(R_R_H)  // if in R environment
-        REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] %s\n", err_counter, date_buf, name().c_str(), msg.c_str());
+        REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] %s\n", err_counter, date_buf, name().c_str(),
+                 msg.c_str());
 #else
-        std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] %s\n", err_counter, date_buf, name().c_str(), msg.c_str());
+        std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] %s\n", err_counter, date_buf,
+                     name().c_str(), msg.c_str());
 #endif
     }
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/logger.h

@@ -15,67 +15,58 @@
 // formatted data, and support for different format per sink.
 
 #include <spdlog/common.h>
-#include <spdlog/details/log_msg.h>
 #include <spdlog/details/backtracer.h>
+#include <spdlog/details/log_msg.h>
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-#    ifndef _WIN32
+    #ifndef _WIN32
-#        error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
+        #error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
-#    endif
+    #endif
-#    include <spdlog/details/os.h>
+    #include <spdlog/details/os.h>
 #endif
 
 #include <vector>
 
 #ifndef SPDLOG_NO_EXCEPTIONS
-#    define SPDLOG_LOGGER_CATCH(location)                                                                                                  \
+    #define SPDLOG_LOGGER_CATCH(location)                                                 \
-        catch (const std::exception &ex)                                                                                                   \
+        catch (const std::exception &ex) {                                                \
-        {                                                                                                                                  \
+            if (location.filename) {                                                      \
-            if (location.filename)                                                                                                         \
+                err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), \
-            {                                                                                                                              \
+                                             location.filename, location.line));          \
-                err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), location.filename, location.line));              \
+            } else {                                                                      \
-            }                                                                                                                              \
+                err_handler_(ex.what());                                                  \
-            else                                                                                                                           \
+            }                                                                             \
-            {                                                                                                                              \
+        }                                                                                 \
-                err_handler_(ex.what());                                                                                                   \
+        catch (...) {                                                                     \
-            }                                                                                                                              \
+            err_handler_("Rethrowing unknown exception in logger");                       \
-        }                                                                                                                                  \
+            throw;                                                                        \
-        catch (...)                                                                                                                        \
-        {                                                                                                                                  \
-            err_handler_("Rethrowing unknown exception in logger");                                                                        \
-            throw;                                                                                                                         \
         }
 #else
-#    define SPDLOG_LOGGER_CATCH(location)
+    #define SPDLOG_LOGGER_CATCH(location)
 #endif
 
 namespace spdlog {
 
-class SPDLOG_API logger
+class SPDLOG_API logger {
-{
 public:
     // Empty logger
     explicit logger(std::string name)
-        : name_(std::move(name))
+        : name_(std::move(name)),
-        , sinks_()
+          sinks_() {}
-    {}
 
     // Logger with range on sinks
-    template<typename It>
+    template <typename It>
     logger(std::string name, It begin, It end)
-        : name_(std::move(name))
+        : name_(std::move(name)),
-        , sinks_(begin, end)
+          sinks_(begin, end) {}
-    {}
 
     // Logger with single sink
     logger(std::string name, sink_ptr single_sink)
-        : logger(std::move(name), {std::move(single_sink)})
+        : logger(std::move(name), {std::move(single_sink)}) {}
-    {}
 
     // Logger with sinks init list
     logger(std::string name, sinks_init_list sinks)
-        : logger(std::move(name), sinks.begin(), sinks.end())
+        : logger(std::move(name), sinks.begin(), sinks.end()) {}
-    {}
 
     virtual ~logger() = default;
 
@@ -84,37 +75,36 @@ public:
     logger &operator=(logger other) SPDLOG_NOEXCEPT;
     void swap(spdlog::logger &other) SPDLOG_NOEXCEPT;
 
-    template<typename... Args>
+    template <typename... Args>
-    void log(source_loc loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&...args)
+    void log(source_loc loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&...args) {
-    {
         log_(loc, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void log(level::level_enum lvl, format_string_t<Args...> fmt, Args &&...args)
+    void log(level::level_enum lvl, format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(source_loc{}, lvl, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename T>
+    template <typename T>
-    void log(level::level_enum lvl, const T &msg)
+    void log(level::level_enum lvl, const T &msg) {
-    {
         log(source_loc{}, lvl, msg);
     }
 
     // T cannot be statically converted to format string (including string_view/wstring_view)
-    template<class T, typename std::enable_if<!is_convertible_to_any_format_string<const T &>::value, int>::type = 0>
+    template <class T,
-    void log(source_loc loc, level::level_enum lvl, const T &msg)
+              typename std::enable_if<!is_convertible_to_any_format_string<const T &>::value,
-    {
+                                      int>::type = 0>
+    void log(source_loc loc, level::level_enum lvl, const T &msg) {
         log(loc, lvl, "{}", msg);
     }
 
-    void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg)
+    void log(log_clock::time_point log_time,
-    {
+             source_loc loc,
+             level::level_enum lvl,
+             string_view_t msg) {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -122,12 +112,10 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(source_loc loc, level::level_enum lvl, string_view_t msg)
+    void log(source_loc loc, level::level_enum lvl, string_view_t msg) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -135,66 +123,56 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(level::level_enum lvl, string_view_t msg)
+    void log(level::level_enum lvl, string_view_t msg) { log(source_loc{}, lvl, msg); }
-    {
-        log(source_loc{}, lvl, msg);
-    }
 
-    template<typename... Args>
+    template <typename... Args>
-    void trace(format_string_t<Args...> fmt, Args &&...args)
+    void trace(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::trace, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void debug(format_string_t<Args...> fmt, Args &&...args)
+    void debug(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::debug, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void info(format_string_t<Args...> fmt, Args &&...args)
+    void info(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::info, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void warn(format_string_t<Args...> fmt, Args &&...args)
+    void warn(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::warn, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void error(format_string_t<Args...> fmt, Args &&...args)
+    void error(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::err, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void critical(format_string_t<Args...> fmt, Args &&...args)
+    void critical(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::critical, fmt, std::forward<Args>(args)...);
     }
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-    template<typename... Args>
+    template <typename... Args>
-    void log(source_loc loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&...args)
+    void log(source_loc loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log_(loc, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void log(level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&...args)
+    void log(level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(source_loc{}, lvl, fmt, std::forward<Args>(args)...);
     }
 
-    void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg)
+    void log(log_clock::time_point log_time,
-    {
+             source_loc loc,
+             level::level_enum lvl,
+             wstring_view_t msg) {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -204,12 +182,10 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(source_loc loc, level::level_enum lvl, wstring_view_t msg)
+    void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -219,95 +195,76 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(level::level_enum lvl, wstring_view_t msg)
+    void log(level::level_enum lvl, wstring_view_t msg) { log(source_loc{}, lvl, msg); }
-    {
-        log(source_loc{}, lvl, msg);
-    }
 
-    template<typename... Args>
+    template <typename... Args>
-    void trace(wformat_string_t<Args...> fmt, Args &&...args)
+    void trace(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::trace, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void debug(wformat_string_t<Args...> fmt, Args &&...args)
+    void debug(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::debug, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void info(wformat_string_t<Args...> fmt, Args &&...args)
+    void info(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::info, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void warn(wformat_string_t<Args...> fmt, Args &&...args)
+    void warn(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::warn, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void error(wformat_string_t<Args...> fmt, Args &&...args)
+    void error(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::err, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void critical(wformat_string_t<Args...> fmt, Args &&...args)
+    void critical(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::critical, fmt, std::forward<Args>(args)...);
     }
 #endif
 
-    template<typename T>
+    template <typename T>
-    void trace(const T &msg)
+    void trace(const T &msg) {
-    {
         log(level::trace, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void debug(const T &msg)
+    void debug(const T &msg) {
-    {
         log(level::debug, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void info(const T &msg)
+    void info(const T &msg) {
-    {
         log(level::info, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void warn(const T &msg)
+    void warn(const T &msg) {
-    {
         log(level::warn, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void error(const T &msg)
+    void error(const T &msg) {
-    {
         log(level::err, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void critical(const T &msg)
+    void critical(const T &msg) {
-    {
         log(level::critical, msg);
     }
 
     // return true logging is enabled for the given level.
-    bool should_log(level::level_enum msg_level) const
+    bool should_log(level::level_enum msg_level) const {
-    {
         return msg_level >= level_.load(std::memory_order_relaxed);
     }
 
     // return true if backtrace logging is enabled.
-    bool should_backtrace() const
+    bool should_backtrace() const { return tracer_.enabled(); }
-    {
-        return tracer_.enabled();
-    }
 
     void set_level(level::level_enum log_level);
 
@@ -356,17 +313,14 @@ protected:
     details::backtracer tracer_;
 
     // common implementation for after templated public api has been resolved
-    template<typename... Args>
+    template <typename... Args>
-    void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&...args)
+    void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&...args) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
-        SPDLOG_TRY
+        SPDLOG_TRY {
-        {
             memory_buf_t buf;
 #ifdef SPDLOG_USE_STD_FORMAT
             fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(args...));
@@ -381,20 +335,18 @@ protected:
     }
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-    template<typename... Args>
+    template <typename... Args>
-    void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&...args)
+    void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&...args) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
-        SPDLOG_TRY
+        SPDLOG_TRY {
-        {
             // format to wmemory_buffer and convert to utf8
             wmemory_buf_t wbuf;
-            fmt_lib::vformat_to(std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(args...));
+            fmt_lib::vformat_to(std::back_inserter(wbuf), fmt,
+                                fmt_lib::make_format_args<fmt_lib::wformat_context>(args...));
 
             memory_buf_t buf;
             details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf);
@@ -403,7 +355,7 @@ protected:
         }
         SPDLOG_LOGGER_CATCH(loc)
     }
-#endif // SPDLOG_WCHAR_TO_UTF8_SUPPORT
+#endif  // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
     // log the given message (if the given log level is high enough),
     // and save backtrace (if backtrace is enabled).
@@ -420,8 +372,8 @@ protected:
 
 void swap(logger &a, logger &b);
 
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "logger-inl.h"
+    #include "logger-inl.h"
 #endif

include/spdlog/pattern_formatter.h

@@ -13,77 +13,67 @@
 #include <memory>
 
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace spdlog {
 namespace details {
 
 // padding information.
-struct padding_info
+struct padding_info {
-{
+    enum class pad_side { left, right, center };
-    enum class pad_side
-    {
-        left,
-        right,
-        center
-    };
 
     padding_info() = default;
     padding_info(size_t width, padding_info::pad_side side, bool truncate)
-        : width_(width)
+        : width_(width),
-        , side_(side)
+          side_(side),
-        , truncate_(truncate)
+          truncate_(truncate),
-        , enabled_(true)
+          enabled_(true) {}
-    {}
 
-    bool enabled() const
+    bool enabled() const { return enabled_; }
-    {
-        return enabled_;
-    }
     size_t width_ = 0;
     pad_side side_ = pad_side::left;
     bool truncate_ = false;
     bool enabled_ = false;
 };
 
-class SPDLOG_API flag_formatter
+class SPDLOG_API flag_formatter {
-{
 public:
     explicit flag_formatter(padding_info padinfo)
-        : padinfo_(padinfo)
+        : padinfo_(padinfo) {}
-    {}
     flag_formatter() = default;
     virtual ~flag_formatter() = default;
-    virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0;
+    virtual void format(const details::log_msg &msg,
+                        const std::tm &tm_time,
+                        memory_buf_t &dest) = 0;
 
 protected:
     padding_info padinfo_;
 };
 
-} // namespace details
+}  // namespace details
 
-class SPDLOG_API custom_flag_formatter : public details::flag_formatter
+class SPDLOG_API custom_flag_formatter : public details::flag_formatter {
-{
 public:
     virtual std::unique_ptr<custom_flag_formatter> clone() const = 0;
 
-    void set_padding_info(const details::padding_info &padding)
+    void set_padding_info(const details::padding_info &padding) {
-    {
         flag_formatter::padinfo_ = padding;
     }
 };
 
-class SPDLOG_API pattern_formatter final : public formatter
+class SPDLOG_API pattern_formatter final : public formatter {
-{
 public:
     using custom_flags = std::unordered_map<char, std::unique_ptr<custom_flag_formatter>>;
 
-    explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local,
+    explicit pattern_formatter(std::string pattern,
-        std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags());
+                               pattern_time_type time_type = pattern_time_type::local,
+                               std::string eol = spdlog::details::os::default_eol,
+                               custom_flags custom_user_flags = custom_flags());
 
     // use default pattern is not given
-    explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol);
+    explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local,
+                               std::string eol = spdlog::details::os::default_eol);
 
     pattern_formatter(const pattern_formatter &other) = delete;
     pattern_formatter &operator=(const pattern_formatter &other) = delete;
@@ -91,9 +81,8 @@ public:
     std::unique_ptr<formatter> clone() const override;
     void format(const details::log_msg &msg, memory_buf_t &dest) override;
 
-    template<typename T, typename... Args>
+    template <typename T, typename... Args>
-    pattern_formatter &add_flag(char flag, Args &&...args)
+    pattern_formatter &add_flag(char flag, Args &&...args) {
-    {
         custom_handlers_[flag] = details::make_unique<T>(std::forward<Args>(args)...);
         return *this;
     }
@@ -111,18 +100,19 @@ private:
     custom_flags custom_handlers_;
 
     std::tm get_time_(const details::log_msg &msg);
-    template<typename Padder>
+    template <typename Padder>
     void handle_flag_(char flag, details::padding_info padding);
 
     // Extract given pad spec (e.g. %8X)
     // Advance the given it pass the end of the padding spec found (if any)
     // Return padding.
-    static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end);
+    static details::padding_info handle_padspec_(std::string::const_iterator &it,
+                                                 std::string::const_iterator end);
 
     void compile_pattern_(const std::string &pattern);
 };
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "pattern_formatter-inl.h"
+    #include "pattern_formatter-inl.h"
 #endif

include/spdlog/sinks/android_sink.h

@@ -5,50 +5,45 @@
 
 #ifdef __ANDROID__
 
-#    include <spdlog/details/fmt_helper.h>
+    #include <spdlog/details/fmt_helper.h>
-#    include <spdlog/details/null_mutex.h>
+    #include <spdlog/details/null_mutex.h>
-#    include <spdlog/details/os.h>
+    #include <spdlog/details/os.h>
-#    include <spdlog/sinks/base_sink.h>
+    #include <spdlog/details/synchronous_factory.h>
-#    include <spdlog/details/synchronous_factory.h>
+    #include <spdlog/sinks/base_sink.h>
 
-#    include <android/log.h>
+    #include <android/log.h>
-#    include <chrono>
+    #include <chrono>
-#    include <mutex>
+    #include <mutex>
-#    include <string>
+    #include <string>
-#    include <thread>
+    #include <thread>
-#    include <type_traits>
+    #include <type_traits>
 
-#    if !defined(SPDLOG_ANDROID_RETRIES)
+    #if !defined(SPDLOG_ANDROID_RETRIES)
-#        define SPDLOG_ANDROID_RETRIES 2
+        #define SPDLOG_ANDROID_RETRIES 2
-#    endif
+    #endif
 
 namespace spdlog {
 namespace sinks {
 
 /*
  * Android sink
- * (logging using __android_log_write or __android_log_buf_write depending on the specified BufferID)
+ * (logging using __android_log_write or __android_log_buf_write depending on the specified
+ * BufferID)
  */
-template<typename Mutex, int BufferID = log_id::LOG_ID_MAIN>
+template <typename Mutex, int BufferID = log_id::LOG_ID_MAIN>
-class android_sink final : public base_sink<Mutex>
+class android_sink final : public base_sink<Mutex> {
-{
 public:
     explicit android_sink(std::string tag = "spdlog", bool use_raw_msg = false)
-        : tag_(std::move(tag))
+        : tag_(std::move(tag)),
-        , use_raw_msg_(use_raw_msg)
+          use_raw_msg_(use_raw_msg) {}
-    {}
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         const android_LogPriority priority = convert_to_android_(msg.level);
         memory_buf_t formatted;
-        if (use_raw_msg_)
+        if (use_raw_msg_) {
-        {
             details::fmt_helper::append_string_view(msg.payload, formatted);
-        }
+        } else {
-        else
-        {
             base_sink<Mutex>::formatter_->format(msg, formatted);
         }
         formatted.push_back('\0');
@@ -56,20 +51,17 @@ protected:
 
         // See system/core/liblog/logger_write.c for explanation of return value
         int ret = android_log(priority, tag_.c_str(), msg_output);
-        if (ret == -EPERM)
+        if (ret == -EPERM) {
-        {
+            return;  // !__android_log_is_loggable
-            return; // !__android_log_is_loggable
         }
         int retry_count = 0;
-        while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES))
+        while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES)) {
-        {
             details::os::sleep_for_millis(5);
             ret = android_log(priority, tag_.c_str(), msg_output);
             retry_count++;
         }
 
-        if (ret < 0)
+        if (ret < 0) {
-        {
             throw_spdlog_ex("logging to Android failed", ret);
         }
     }
@@ -77,39 +69,38 @@ protected:
     void flush_() override {}
 
 private:
-    // There might be liblog versions used, that do not support __android_log_buf_write. So we only compile and link against
+    // There might be liblog versions used, that do not support __android_log_buf_write. So we only
-    // __android_log_buf_write, if user explicitly provides a non-default log buffer. Otherwise, when using the default log buffer, always
+    // compile and link against
-    // log via __android_log_write.
+    // __android_log_buf_write, if user explicitly provides a non-default log buffer. Otherwise,
-    template<int ID = BufferID>
+    // when using the default log buffer, always log via __android_log_write.
-    typename std::enable_if<ID == static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(int prio, const char *tag, const char *text)
+    template <int ID = BufferID>
-    {
+    typename std::enable_if<ID == static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(
+        int prio, const char *tag, const char *text) {
         return __android_log_write(prio, tag, text);
     }
 
-    template<int ID = BufferID>
+    template <int ID = BufferID>
-    typename std::enable_if<ID != static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(int prio, const char *tag, const char *text)
+    typename std::enable_if<ID != static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(
-    {
+        int prio, const char *tag, const char *text) {
         return __android_log_buf_write(ID, prio, tag, text);
     }
 
-    static android_LogPriority convert_to_android_(spdlog::level::level_enum level)
+    static android_LogPriority convert_to_android_(spdlog::level::level_enum level) {
-    {
+        switch (level) {
-        switch (level)
+            case spdlog::level::trace:
-        {
+                return ANDROID_LOG_VERBOSE;
-        case spdlog::level::trace:
+            case spdlog::level::debug:
-            return ANDROID_LOG_VERBOSE;
+                return ANDROID_LOG_DEBUG;
-        case spdlog::level::debug:
+            case spdlog::level::info:
-            return ANDROID_LOG_DEBUG;
+                return ANDROID_LOG_INFO;
-        case spdlog::level::info:
+            case spdlog::level::warn:
-            return ANDROID_LOG_INFO;
+                return ANDROID_LOG_WARN;
-        case spdlog::level::warn:
+            case spdlog::level::err:
-            return ANDROID_LOG_WARN;
+                return ANDROID_LOG_ERROR;
-        case spdlog::level::err:
+            case spdlog::level::critical:
-            return ANDROID_LOG_ERROR;
+                return ANDROID_LOG_FATAL;
-        case spdlog::level::critical:
+            default:
-            return ANDROID_LOG_FATAL;
+                return ANDROID_LOG_DEFAULT;
-        default:
-            return ANDROID_LOG_DEFAULT;
         }
     }
 
@@ -120,27 +111,27 @@ private:
 using android_sink_mt = android_sink<std::mutex>;
 using android_sink_st = android_sink<details::null_mutex>;
 
-template<int BufferId = log_id::LOG_ID_MAIN>
+template <int BufferId = log_id::LOG_ID_MAIN>
 using android_sink_buf_mt = android_sink<std::mutex, BufferId>;
-template<int BufferId = log_id::LOG_ID_MAIN>
+template <int BufferId = log_id::LOG_ID_MAIN>
 using android_sink_buf_st = android_sink<details::null_mutex, BufferId>;
 
-} // namespace sinks
+}  // namespace sinks
 
 // Create and register android syslog logger
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> android_logger_mt(const std::string &logger_name, const std::string &tag = "spdlog")
+inline std::shared_ptr<logger> android_logger_mt(const std::string &logger_name,
-{
+                                                 const std::string &tag = "spdlog") {
     return Factory::template create<sinks::android_sink_mt>(logger_name, tag);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> android_logger_st(const std::string &logger_name, const std::string &tag = "spdlog")
+inline std::shared_ptr<logger> android_logger_st(const std::string &logger_name,
-{
+                                                 const std::string &tag = "spdlog") {
     return Factory::template create<sinks::android_sink_st>(logger_name, tag);
 }
 
-} // namespace spdlog
+}  // namespace spdlog
 
-#endif // __ANDROID__
+#endif  // __ANDROID__

include/spdlog/sinks/ansicolor_sink-inl.h

@@ -4,20 +4,20 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/ansicolor_sink.h>
+    #include <spdlog/sinks/ansicolor_sink.h>
 #endif
 
-#include <spdlog/pattern_formatter.h>
 #include <spdlog/details/os.h>
+#include <spdlog/pattern_formatter.h>
 
 namespace spdlog {
 namespace sinks {
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE ansicolor_sink<ConsoleMutex>::ansicolor_sink(FILE *target_file, color_mode mode)
-    : target_file_(target_file)
+    : target_file_(target_file),
-    , mutex_(ConsoleMutex::mutex())
+      mutex_(ConsoleMutex::mutex()),
-    , formatter_(details::make_unique<spdlog::pattern_formatter>())
+      formatter_(details::make_unique<spdlog::pattern_formatter>())
 
 {
     set_color_mode(mode);
@@ -30,16 +30,15 @@ SPDLOG_INLINE ansicolor_sink<ConsoleMutex>::ansicolor_sink(FILE *target_file, co
     colors_.at(level::off) = to_string_(reset);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color(level::level_enum color_level, string_view_t color)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color(level::level_enum color_level,
-{
+                                                           string_view_t color) {
     std::lock_guard<mutex_t> lock(mutex_);
     colors_.at(static_cast<size_t>(color_level)) = to_string_(color);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg) {
-{
     // Wrap the originally formatted message in color codes.
     // If color is not supported in the terminal, log as is instead.
     std::lock_guard<mutex_t> lock(mutex_);
@@ -47,8 +46,7 @@ SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg
     msg.color_range_end = 0;
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    if (should_do_colors_ && msg.color_range_end > msg.color_range_start)
+    if (should_do_colors_ && msg.color_range_end > msg.color_range_start) {
-    {
         // before color range
         print_range_(formatted, 0, msg.color_range_start);
         // in color range
@@ -57,89 +55,81 @@ SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg
         print_ccode_(reset);
         // after color range
         print_range_(formatted, msg.color_range_end, formatted.size());
-    }
+    } else  // no color
-    else // no color
     {
         print_range_(formatted, 0, formatted.size());
     }
     fflush(target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::flush()
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::flush() {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     fflush(target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_formatter(
-{
+    std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::move(sink_formatter);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE bool ansicolor_sink<ConsoleMutex>::should_color()
+SPDLOG_INLINE bool ansicolor_sink<ConsoleMutex>::should_color() {
-{
     return should_do_colors_;
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color_mode(color_mode mode)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color_mode(color_mode mode) {
-{
+    switch (mode) {
-    switch (mode)
+        case color_mode::always:
-    {
+            should_do_colors_ = true;
-    case color_mode::always:
+            return;
-        should_do_colors_ = true;
+        case color_mode::automatic:
-        return;
+            should_do_colors_ =
-    case color_mode::automatic:
+                details::os::in_terminal(target_file_) && details::os::is_color_terminal();
-        should_do_colors_ = details::os::in_terminal(target_file_) && details::os::is_color_terminal();
+            return;
-        return;
+        case color_mode::never:
-    case color_mode::never:
+            should_do_colors_ = false;
-        should_do_colors_ = false;
+            return;
-        return;
+        default:
-    default:
+            should_do_colors_ = false;
-        should_do_colors_ = false;
     }
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_ccode_(const string_view_t &color_code)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_ccode_(const string_view_t &color_code) {
-{
     fwrite(color_code.data(), sizeof(char), color_code.size(), target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted, size_t start, size_t end)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted,
-{
+                                                              size_t start,
+                                                              size_t end) {
     fwrite(formatted.data() + start, sizeof(char), end - start, target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE std::string ansicolor_sink<ConsoleMutex>::to_string_(const string_view_t &sv)
+SPDLOG_INLINE std::string ansicolor_sink<ConsoleMutex>::to_string_(const string_view_t &sv) {
-{
     return std::string(sv.data(), sv.size());
 }
 
 // ansicolor_stdout_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE ansicolor_stdout_sink<ConsoleMutex>::ansicolor_stdout_sink(color_mode mode)
-    : ansicolor_sink<ConsoleMutex>(stdout, mode)
+    : ansicolor_sink<ConsoleMutex>(stdout, mode) {}
-{}
 
 // ansicolor_stderr_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE ansicolor_stderr_sink<ConsoleMutex>::ansicolor_stderr_sink(color_mode mode)
-    : ansicolor_sink<ConsoleMutex>(stderr, mode)
+    : ansicolor_sink<ConsoleMutex>(stderr, mode) {}
-{}
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/ansicolor_sink.h

@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include <array>
+#include <memory>
+#include <mutex>
 #include <spdlog/details/console_globals.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/sinks/sink.h>
-#include <memory>
-#include <mutex>
 #include <string>
-#include <array>
 
 namespace spdlog {
 namespace sinks {
@@ -21,9 +21,8 @@ namespace sinks {
  * If no color terminal detected, omit the escape codes.
  */
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class ansicolor_sink : public sink
+class ansicolor_sink : public sink {
-{
 public:
     using mutex_t = typename ConsoleMutex::mutex_t;
     ansicolor_sink(FILE *target_file, color_mode mode);
@@ -90,16 +89,14 @@ private:
     static std::string to_string_(const string_view_t &sv);
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class ansicolor_stdout_sink : public ansicolor_sink<ConsoleMutex>
+class ansicolor_stdout_sink : public ansicolor_sink<ConsoleMutex> {
-{
 public:
     explicit ansicolor_stdout_sink(color_mode mode = color_mode::automatic);
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class ansicolor_stderr_sink : public ansicolor_sink<ConsoleMutex>
+class ansicolor_stderr_sink : public ansicolor_sink<ConsoleMutex> {
-{
 public:
     explicit ansicolor_stderr_sink(color_mode mode = color_mode::automatic);
 };
@@ -110,9 +107,9 @@ using ansicolor_stdout_sink_st = ansicolor_stdout_sink<details::console_nullmute
 using ansicolor_stderr_sink_mt = ansicolor_stderr_sink<details::console_mutex>;
 using ansicolor_stderr_sink_st = ansicolor_stderr_sink<details::console_nullmutex>;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "ansicolor_sink-inl.h"
+    #include "ansicolor_sink-inl.h"
 #endif

include/spdlog/sinks/base_sink-inl.h

@@ -4,60 +4,56 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/base_sink.h>
+    #include <spdlog/sinks/base_sink.h>
 #endif
 
 #include <spdlog/common.h>
 #include <spdlog/pattern_formatter.h>
 
 #include <memory>
+#include <mutex>
 
-template<typename Mutex>
+template <typename Mutex>
 SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::base_sink()
-    : formatter_{details::make_unique<spdlog::pattern_formatter>()}
+    : formatter_{details::make_unique<spdlog::pattern_formatter>()} {}
-{}
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::base_sink(std::unique_ptr<spdlog::formatter> formatter)
+SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::base_sink(
-    : formatter_{std::move(formatter)}
+    std::unique_ptr<spdlog::formatter> formatter)
-{}
+    : formatter_{std::move(formatter)} {}
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::log(const details::log_msg &msg)
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::log(const details::log_msg &msg) {
-{
     std::lock_guard<Mutex> lock(mutex_);
     sink_it_(msg);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::flush()
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::flush() {
-{
     std::lock_guard<Mutex> lock(mutex_);
     flush_();
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern(const std::string &pattern)
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<Mutex> lock(mutex_);
     set_pattern_(pattern);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+void SPDLOG_INLINE
-{
+spdlog::sinks::base_sink<Mutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<Mutex> lock(mutex_);
     set_formatter_(std::move(sink_formatter));
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern_(const std::string &pattern)
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern_(const std::string &pattern) {
-{
     set_formatter_(details::make_unique<spdlog::pattern_formatter>(pattern));
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter)
+void SPDLOG_INLINE
-{
+spdlog::sinks::base_sink<Mutex>::set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) {
     formatter_ = std::move(sink_formatter);
 }

include/spdlog/sinks/base_sink.h

@@ -15,9 +15,8 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class SPDLOG_API base_sink : public sink
+class SPDLOG_API base_sink : public sink {
-{
 public:
     base_sink();
     explicit base_sink(std::unique_ptr<spdlog::formatter> formatter);
@@ -44,9 +43,9 @@ protected:
     virtual void set_pattern_(const std::string &pattern);
     virtual void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter);
 };
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "base_sink-inl.h"
+    #include "base_sink-inl.h"
 #endif

include/spdlog/sinks/basic_file_sink-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/basic_file_sink.h>
+    #include <spdlog/sinks/basic_file_sink.h>
 #endif
 
 #include <spdlog/common.h>
@@ -13,32 +13,30 @@
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE basic_file_sink<Mutex>::basic_file_sink(const filename_t &filename, bool truncate, const file_event_handlers &event_handlers)
+SPDLOG_INLINE basic_file_sink<Mutex>::basic_file_sink(const filename_t &filename,
-    : file_helper_{event_handlers}
+                                                      bool truncate,
-{
+                                                      const file_event_handlers &event_handlers)
+    : file_helper_{event_handlers} {
     file_helper_.open(filename, truncate);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE const filename_t &basic_file_sink<Mutex>::filename() const
+SPDLOG_INLINE const filename_t &basic_file_sink<Mutex>::filename() const {
-{
     return file_helper_.filename();
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void basic_file_sink<Mutex>::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void basic_file_sink<Mutex>::sink_it_(const details::log_msg &msg) {
-{
     memory_buf_t formatted;
     base_sink<Mutex>::formatter_->format(msg, formatted);
     file_helper_.write(formatted);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void basic_file_sink<Mutex>::flush_()
+SPDLOG_INLINE void basic_file_sink<Mutex>::flush_() {
-{
     file_helper_.flush();
 }
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/basic_file_sink.h

@@ -5,8 +5,8 @@
 
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <mutex>
 #include <string>
@@ -16,11 +16,12 @@ namespace sinks {
 /*
  * Trivial file sink with single file as target
  */
-template<typename Mutex>
+template <typename Mutex>
-class basic_file_sink final : public base_sink<Mutex>
+class basic_file_sink final : public base_sink<Mutex> {
-{
 public:
-    explicit basic_file_sink(const filename_t &filename, bool truncate = false, const file_event_handlers &event_handlers = {});
+    explicit basic_file_sink(const filename_t &filename,
+                             bool truncate = false,
+                             const file_event_handlers &event_handlers = {});
     const filename_t &filename() const;
 
 protected:
@@ -34,27 +35,31 @@ private:
 using basic_file_sink_mt = basic_file_sink<std::mutex>;
 using basic_file_sink_st = basic_file_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> basic_logger_mt(
+inline std::shared_ptr<logger> basic_logger_mt(const std::string &logger_name,
-    const std::string &logger_name, const filename_t &filename, bool truncate = false, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               bool truncate = false,
-    return Factory::template create<sinks::basic_file_sink_mt>(logger_name, filename, truncate, event_handlers);
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::basic_file_sink_mt>(logger_name, filename, truncate,
+                                                               event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> basic_logger_st(
+inline std::shared_ptr<logger> basic_logger_st(const std::string &logger_name,
-    const std::string &logger_name, const filename_t &filename, bool truncate = false, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               bool truncate = false,
-    return Factory::template create<sinks::basic_file_sink_st>(logger_name, filename, truncate, event_handlers);
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::basic_file_sink_st>(logger_name, filename, truncate,
+                                                               event_handlers);
 }
 
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "basic_file_sink-inl.h"
+    #include "basic_file_sink-inl.h"
 #endif

include/spdlog/sinks/callback_sink.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <mutex>
 #include <string>
@@ -19,19 +19,14 @@ namespace sinks {
 /*
  * Trivial callback sink, gets a callback function and calls it on each log
  */
-template<typename Mutex>
+template <typename Mutex>
-class callback_sink final : public base_sink<Mutex>
+class callback_sink final : public base_sink<Mutex> {
-{
 public:
     explicit callback_sink(const custom_log_callback &callback)
-        : callback_{callback}
+        : callback_{callback} {}
-    {}
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override { callback_(msg); }
-    {
-        callback_(msg);
-    }
     void flush_() override{};
 
 private:
@@ -41,21 +36,21 @@ private:
 using callback_sink_mt = callback_sink<std::mutex>;
 using callback_sink_st = callback_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> callback_logger_mt(const std::string &logger_name, const custom_log_callback &callback)
+inline std::shared_ptr<logger> callback_logger_mt(const std::string &logger_name,
-{
+                                                  const custom_log_callback &callback) {
     return Factory::template create<sinks::callback_sink_mt>(logger_name, callback);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> callback_logger_st(const std::string &logger_name, const custom_log_callback &callback)
+inline std::shared_ptr<logger> callback_logger_st(const std::string &logger_name,
-{
+                                                  const custom_log_callback &callback) {
     return Factory::template create<sinks::callback_sink_st>(logger_name, callback);
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/daily_file_sink.h

@@ -4,20 +4,20 @@
 #pragma once
 
 #include <spdlog/common.h>
+#include <spdlog/details/circular_q.h>
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/fmt/fmt.h>
-#include <spdlog/fmt/chrono.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/os.h>
-#include <spdlog/details/circular_q.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/fmt/chrono.h>
+#include <spdlog/fmt/fmt.h>
+#include <spdlog/sinks/base_sink.h>
 
-#include <sstream>
-#include <iomanip>
 #include <chrono>
 #include <cstdio>
+#include <iomanip>
 #include <mutex>
+#include <sstream>
 #include <string>
 
 namespace spdlog {
@@ -26,29 +26,28 @@ namespace sinks {
 /*
  * Generator of daily log file names in format basename.YYYY-MM-DD.ext
  */
-struct daily_filename_calculator
+struct daily_filename_calculator {
-{
     // Create filename for the form basename.YYYY-MM-DD
-    static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
+    static filename_t calc_filename(const filename_t &filename, const tm &now_tm) {
-    {
         filename_t basename, ext;
         std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
-        return fmt_lib::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}")), basename, now_tm.tm_year + 1900,
+        return fmt_lib::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}")),
-            now_tm.tm_mon + 1, now_tm.tm_mday, ext);
+                               basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday,
+                               ext);
     }
 };
 
 /*
  * Generator of daily log file names with strftime format.
  * Usages:
- *    auto sink =  std::make_shared<spdlog::sinks::daily_file_format_sink_mt>("myapp-%Y-%m-%d:%H:%M:%S.log", hour, minute);"
+ *    auto sink =
- *    auto logger = spdlog::daily_logger_format_mt("loggername, "myapp-%Y-%m-%d:%X.log", hour,  minute)"
+ * std::make_shared<spdlog::sinks::daily_file_format_sink_mt>("myapp-%Y-%m-%d:%H:%M:%S.log", hour,
+ * minute);" auto logger = spdlog::daily_logger_format_mt("loggername, "myapp-%Y-%m-%d:%X.log",
+ * hour,  minute)"
  *
  */
-struct daily_filename_format_calculator
+struct daily_filename_format_calculator {
-{
+    static filename_t calc_filename(const filename_t &file_path, const tm &now_tm) {
-    static filename_t calc_filename(const filename_t &file_path, const tm &now_tm)
-    {
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
         std::wstringstream stream;
 #else
@@ -64,23 +63,25 @@ struct daily_filename_format_calculator
  * If truncate != false , the created file will be truncated.
  * If max_files > 0, retain only the last max_files and delete previous.
  */
-template<typename Mutex, typename FileNameCalc = daily_filename_calculator>
+template <typename Mutex, typename FileNameCalc = daily_filename_calculator>
-class daily_file_sink final : public base_sink<Mutex>
+class daily_file_sink final : public base_sink<Mutex> {
-{
 public:
     // create daily file sink which rotates on given time
-    daily_file_sink(filename_t base_filename, int rotation_hour, int rotation_minute, bool truncate = false, uint16_t max_files = 0,
+    daily_file_sink(filename_t base_filename,
-        const file_event_handlers &event_handlers = {})
+                    int rotation_hour,
-        : base_filename_(std::move(base_filename))
+                    int rotation_minute,
-        , rotation_h_(rotation_hour)
+                    bool truncate = false,
-        , rotation_m_(rotation_minute)
+                    uint16_t max_files = 0,
-        , file_helper_{event_handlers}
+                    const file_event_handlers &event_handlers = {})
-        , truncate_(truncate)
+        : base_filename_(std::move(base_filename)),
-        , max_files_(max_files)
+          rotation_h_(rotation_hour),
-        , filenames_q_()
+          rotation_m_(rotation_minute),
-    {
+          file_helper_{event_handlers},
-        if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 || rotation_minute > 59)
+          truncate_(truncate),
-        {
+          max_files_(max_files),
+          filenames_q_() {
+        if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 ||
+            rotation_minute > 59) {
             throw_spdlog_ex("daily_file_sink: Invalid rotation time in ctor");
         }
 
@@ -89,25 +90,21 @@ public:
         file_helper_.open(filename, truncate_);
         rotation_tp_ = next_rotation_tp_();
 
-        if (max_files_ > 0)
+        if (max_files_ > 0) {
-        {
             init_filenames_q_();
         }
     }
 
-    filename_t filename()
+    filename_t filename() {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         return file_helper_.filename();
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         auto time = msg.time;
         bool should_rotate = time >= rotation_tp_;
-        if (should_rotate)
+        if (should_rotate) {
-        {
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(time));
             file_helper_.open(filename, truncate_);
             rotation_tp_ = next_rotation_tp_();
@@ -117,57 +114,46 @@ protected:
         file_helper_.write(formatted);
 
         // Do the cleaning only at the end because it might throw on failure.
-        if (should_rotate && max_files_ > 0)
+        if (should_rotate && max_files_ > 0) {
-        {
             delete_old_();
         }
     }
 
-    void flush_() override
+    void flush_() override { file_helper_.flush(); }
-    {
-        file_helper_.flush();
-    }
 
 private:
-    void init_filenames_q_()
+    void init_filenames_q_() {
-    {
         using details::os::path_exists;
 
         filenames_q_ = details::circular_q<filename_t>(static_cast<size_t>(max_files_));
         std::vector<filename_t> filenames;
         auto now = log_clock::now();
-        while (filenames.size() < max_files_)
+        while (filenames.size() < max_files_) {
-        {
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now));
-            if (!path_exists(filename))
+            if (!path_exists(filename)) {
-            {
                 break;
             }
             filenames.emplace_back(filename);
             now -= std::chrono::hours(24);
         }
-        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter)
+        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter) {
-        {
             filenames_q_.push_back(std::move(*iter));
         }
     }
 
-    tm now_tm(log_clock::time_point tp)
+    tm now_tm(log_clock::time_point tp) {
-    {
         time_t tnow = log_clock::to_time_t(tp);
         return spdlog::details::os::localtime(tnow);
     }
 
-    log_clock::time_point next_rotation_tp_()
+    log_clock::time_point next_rotation_tp_() {
-    {
         auto now = log_clock::now();
         tm date = now_tm(now);
         date.tm_hour = rotation_h_;
         date.tm_min = rotation_m_;
         date.tm_sec = 0;
         auto rotation_time = log_clock::from_time_t(std::mktime(&date));
-        if (rotation_time > now)
+        if (rotation_time > now) {
-        {
             return rotation_time;
         }
         return {rotation_time + std::chrono::hours(24)};
@@ -175,21 +161,19 @@ private:
 
     // Delete the file N rotations ago.
     // Throw spdlog_ex on failure to delete the old file.
-    void delete_old_()
+    void delete_old_() {
-    {
         using details::os::filename_to_str;
         using details::os::remove_if_exists;
 
         filename_t current_file = file_helper_.filename();
-        if (filenames_q_.full())
+        if (filenames_q_.full()) {
-        {
             auto old_filename = std::move(filenames_q_.front());
             filenames_q_.pop_front();
             bool ok = remove_if_exists(old_filename) == 0;
-            if (!ok)
+            if (!ok) {
-            {
                 filenames_q_.push_back(std::move(current_file));
-                throw_spdlog_ex("Failed removing daily file " + filename_to_str(old_filename), errno);
+                throw_spdlog_ex("Failed removing daily file " + filename_to_str(old_filename),
+                                errno);
             }
         }
         filenames_q_.push_back(std::move(current_file));
@@ -208,40 +192,61 @@ private:
 using daily_file_sink_mt = daily_file_sink<std::mutex>;
 using daily_file_sink_st = daily_file_sink<details::null_mutex>;
 using daily_file_format_sink_mt = daily_file_sink<std::mutex, daily_filename_format_calculator>;
-using daily_file_format_sink_st = daily_file_sink<details::null_mutex, daily_filename_format_calculator>;
+using daily_file_format_sink_st =
+    daily_file_sink<details::null_mutex, daily_filename_format_calculator>;
 
-} // namespace sinks
+}  // namespace sinks
 
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_mt(const std::string &logger_name, const filename_t &filename, int hour = 0, int minute = 0,
+inline std::shared_ptr<logger> daily_logger_mt(const std::string &logger_name,
-    bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               int hour = 0,
-    return Factory::template create<sinks::daily_file_sink_mt>(logger_name, filename, hour, minute, truncate, max_files, event_handlers);
+                                               int minute = 0,
+                                               bool truncate = false,
+                                               uint16_t max_files = 0,
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::daily_file_sink_mt>(logger_name, filename, hour, minute,
+                                                               truncate, max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_format_mt(const std::string &logger_name, const filename_t &filename, int hour = 0,
+inline std::shared_ptr<logger> daily_logger_format_mt(
-    int minute = 0, bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+    const std::string &logger_name,
-{
+    const filename_t &filename,
+    int hour = 0,
+    int minute = 0,
+    bool truncate = false,
+    uint16_t max_files = 0,
+    const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::daily_file_format_sink_mt>(
         logger_name, filename, hour, minute, truncate, max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_st(const std::string &logger_name, const filename_t &filename, int hour = 0, int minute = 0,
+inline std::shared_ptr<logger> daily_logger_st(const std::string &logger_name,
-    bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               int hour = 0,
-    return Factory::template create<sinks::daily_file_sink_st>(logger_name, filename, hour, minute, truncate, max_files, event_handlers);
+                                               int minute = 0,
+                                               bool truncate = false,
+                                               uint16_t max_files = 0,
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::daily_file_sink_st>(logger_name, filename, hour, minute,
+                                                               truncate, max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_format_st(const std::string &logger_name, const filename_t &filename, int hour = 0,
+inline std::shared_ptr<logger> daily_logger_format_st(
-    int minute = 0, bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+    const std::string &logger_name,
-{
+    const filename_t &filename,
+    int hour = 0,
+    int minute = 0,
+    bool truncate = false,
+    uint16_t max_files = 0,
+    const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::daily_file_format_sink_st>(
         logger_name, filename, hour, minute, truncate, max_files, event_handlers);
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/dist_sink.h

@@ -19,71 +19,55 @@
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
-class dist_sink : public base_sink<Mutex>
+class dist_sink : public base_sink<Mutex> {
-{
 public:
     dist_sink() = default;
     explicit dist_sink(std::vector<std::shared_ptr<sink>> sinks)
-        : sinks_(sinks)
+        : sinks_(sinks) {}
-    {}
 
     dist_sink(const dist_sink &) = delete;
     dist_sink &operator=(const dist_sink &) = delete;
 
-    void add_sink(std::shared_ptr<sink> sub_sink)
+    void add_sink(std::shared_ptr<sink> sub_sink) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         sinks_.push_back(sub_sink);
     }
 
-    void remove_sink(std::shared_ptr<sink> sub_sink)
+    void remove_sink(std::shared_ptr<sink> sub_sink) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sub_sink), sinks_.end());
     }
 
-    void set_sinks(std::vector<std::shared_ptr<sink>> sinks)
+    void set_sinks(std::vector<std::shared_ptr<sink>> sinks) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         sinks_ = std::move(sinks);
     }
 
-    std::vector<std::shared_ptr<sink>> &sinks()
+    std::vector<std::shared_ptr<sink>> &sinks() { return sinks_; }
-    {
-        return sinks_;
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
+        for (auto &sub_sink : sinks_) {
-        for (auto &sub_sink : sinks_)
+            if (sub_sink->should_log(msg.level)) {
-        {
-            if (sub_sink->should_log(msg.level))
-            {
                 sub_sink->log(msg);
             }
         }
     }
 
-    void flush_() override
+    void flush_() override {
-    {
+        for (auto &sub_sink : sinks_) {
-        for (auto &sub_sink : sinks_)
-        {
             sub_sink->flush();
         }
     }
 
-    void set_pattern_(const std::string &pattern) override
+    void set_pattern_(const std::string &pattern) override {
-    {
         set_formatter_(details::make_unique<spdlog::pattern_formatter>(pattern));
     }
 
-    void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override
+    void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override {
-    {
         base_sink<Mutex>::formatter_ = std::move(sink_formatter);
-        for (auto &sub_sink : sinks_)
+        for (auto &sub_sink : sinks_) {
-        {
             sub_sink->set_formatter(base_sink<Mutex>::formatter_->clone());
         }
     }
@@ -93,5 +77,5 @@ protected:
 using dist_sink_mt = dist_sink<std::mutex>;
 using dist_sink_st = dist_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/dup_filter_sink.h

@@ -4,13 +4,13 @@
 #pragma once
 
 #include "dist_sink.h"
-#include <spdlog/details/null_mutex.h>
 #include <spdlog/details/log_msg.h>
+#include <spdlog/details/null_mutex.h>
 
+#include <chrono>
 #include <cstdio>
 #include <mutex>
 #include <string>
-#include <chrono>
 
 // Duplicate message removal sink.
 // Skip the message if previous one is identical and less than "max_skip_duration" have passed
@@ -20,8 +20,8 @@
 //     #include <spdlog/sinks/dup_filter_sink.h>
 //
 //     int main() {
-//         auto dup_filter = std::make_shared<dup_filter_sink_st>(std::chrono::seconds(5), level::info);
+//         auto dup_filter = std::make_shared<dup_filter_sink_st>(std::chrono::seconds(5),
-//         dup_filter->add_sink(std::make_shared<stdout_color_sink_mt>());
+//         level::info); dup_filter->add_sink(std::make_shared<stdout_color_sink_mt>());
 //         spdlog::logger l("logger", dup_filter);
 //         l.info("Hello");
 //         l.info("Hello");
@@ -36,15 +36,14 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class dup_filter_sink : public dist_sink<Mutex>
+class dup_filter_sink : public dist_sink<Mutex> {
-{
 public:
-    template<class Rep, class Period>
+    template <class Rep, class Period>
-    explicit dup_filter_sink(std::chrono::duration<Rep, Period> max_skip_duration, level::level_enum notification_level = level::info)
+    explicit dup_filter_sink(std::chrono::duration<Rep, Period> max_skip_duration,
-        : max_skip_duration_{max_skip_duration}
+                             level::level_enum notification_level = level::info)
-        , log_level_{notification_level}
+        : max_skip_duration_{max_skip_duration},
-    {}
+          log_level_{notification_level} {}
 
 protected:
     std::chrono::microseconds max_skip_duration_;
@@ -53,23 +52,21 @@ protected:
     size_t skip_counter_ = 0;
     level::level_enum log_level_;
 
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         bool filtered = filter_(msg);
-        if (!filtered)
+        if (!filtered) {
-        {
             skip_counter_ += 1;
             return;
         }
 
         // log the "skipped.." message
-        if (skip_counter_ > 0)
+        if (skip_counter_ > 0) {
-        {
             char buf[64];
-            auto msg_size = ::snprintf(buf, sizeof(buf), "Skipped %u duplicate messages..", static_cast<unsigned>(skip_counter_));
+            auto msg_size = ::snprintf(buf, sizeof(buf), "Skipped %u duplicate messages..",
-            if (msg_size > 0 && static_cast<size_t>(msg_size) < sizeof(buf))
+                                       static_cast<unsigned>(skip_counter_));
-            {
+            if (msg_size > 0 && static_cast<size_t>(msg_size) < sizeof(buf)) {
-                details::log_msg skipped_msg{msg.source, msg.logger_name, log_level_, string_view_t{buf, static_cast<size_t>(msg_size)}};
+                details::log_msg skipped_msg{msg.source, msg.logger_name, log_level_,
+                                             string_view_t{buf, static_cast<size_t>(msg_size)}};
                 dist_sink<Mutex>::sink_it_(skipped_msg);
             }
         }
@@ -82,8 +79,7 @@ protected:
     }
 
     // return whether the log msg should be displayed (true) or skipped (false)
-    bool filter_(const details::log_msg &msg)
+    bool filter_(const details::log_msg &msg) {
-    {
         auto filter_duration = msg.time - last_msg_time_;
         return (filter_duration > max_skip_duration_) || (msg.payload != last_msg_payload_);
     }
@@ -92,5 +88,5 @@ protected:
 using dup_filter_sink_mt = dup_filter_sink<std::mutex>;
 using dup_filter_sink_st = dup_filter_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/hourly_file_sink.h

@@ -4,13 +4,13 @@
 #pragma once
 
 #include <spdlog/common.h>
+#include <spdlog/details/circular_q.h>
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/details/os.h>
+#include <spdlog/details/synchronous_factory.h>
 #include <spdlog/fmt/fmt.h>
 #include <spdlog/sinks/base_sink.h>
-#include <spdlog/details/os.h>
-#include <spdlog/details/circular_q.h>
-#include <spdlog/details/synchronous_factory.h>
 
 #include <chrono>
 #include <cstdio>
@@ -24,15 +24,14 @@ namespace sinks {
 /*
  * Generator of Hourly log file names in format basename.YYYY-MM-DD-HH.ext
  */
-struct hourly_filename_calculator
+struct hourly_filename_calculator {
-{
     // Create filename for the form basename.YYYY-MM-DD-H
-    static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
+    static filename_t calc_filename(const filename_t &filename, const tm &now_tm) {
-    {
         filename_t basename, ext;
         std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
-        return fmt_lib::format(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}_{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1,
+        return fmt_lib::format(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}_{:02d}{}"), basename,
-            now_tm.tm_mday, now_tm.tm_hour, ext);
+                               now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday,
+                               now_tm.tm_hour, ext);
     }
 };
 
@@ -41,46 +40,41 @@ struct hourly_filename_calculator
  * If truncate != false , the created file will be truncated.
  * If max_files > 0, retain only the last max_files and delete previous.
  */
-template<typename Mutex, typename FileNameCalc = hourly_filename_calculator>
+template <typename Mutex, typename FileNameCalc = hourly_filename_calculator>
-class hourly_file_sink final : public base_sink<Mutex>
+class hourly_file_sink final : public base_sink<Mutex> {
-{
 public:
     // create hourly file sink which rotates on given time
-    hourly_file_sink(
+    hourly_file_sink(filename_t base_filename,
-        filename_t base_filename, bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                     bool truncate = false,
-        : base_filename_(std::move(base_filename))
+                     uint16_t max_files = 0,
-        , file_helper_{event_handlers}
+                     const file_event_handlers &event_handlers = {})
-        , truncate_(truncate)
+        : base_filename_(std::move(base_filename)),
-        , max_files_(max_files)
+          file_helper_{event_handlers},
-        , filenames_q_()
+          truncate_(truncate),
-    {
+          max_files_(max_files),
+          filenames_q_() {
         auto now = log_clock::now();
         auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now));
         file_helper_.open(filename, truncate_);
         remove_init_file_ = file_helper_.size() == 0;
         rotation_tp_ = next_rotation_tp_();
 
-        if (max_files_ > 0)
+        if (max_files_ > 0) {
-        {
             init_filenames_q_();
         }
     }
 
-    filename_t filename()
+    filename_t filename() {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         return file_helper_.filename();
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         auto time = msg.time;
         bool should_rotate = time >= rotation_tp_;
-        if (should_rotate)
+        if (should_rotate) {
-        {
+            if (remove_init_file_) {
-            if (remove_init_file_)
-            {
                 file_helper_.close();
                 details::os::remove(file_helper_.filename());
             }
@@ -94,56 +88,45 @@ protected:
         file_helper_.write(formatted);
 
         // Do the cleaning only at the end because it might throw on failure.
-        if (should_rotate && max_files_ > 0)
+        if (should_rotate && max_files_ > 0) {
-        {
             delete_old_();
         }
     }
 
-    void flush_() override
+    void flush_() override { file_helper_.flush(); }
-    {
-        file_helper_.flush();
-    }
 
 private:
-    void init_filenames_q_()
+    void init_filenames_q_() {
-    {
         using details::os::path_exists;
 
         filenames_q_ = details::circular_q<filename_t>(static_cast<size_t>(max_files_));
         std::vector<filename_t> filenames;
         auto now = log_clock::now();
-        while (filenames.size() < max_files_)
+        while (filenames.size() < max_files_) {
-        {
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now));
-            if (!path_exists(filename))
+            if (!path_exists(filename)) {
-            {
                 break;
             }
             filenames.emplace_back(filename);
             now -= std::chrono::hours(1);
         }
-        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter)
+        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter) {
-        {
             filenames_q_.push_back(std::move(*iter));
         }
     }
 
-    tm now_tm(log_clock::time_point tp)
+    tm now_tm(log_clock::time_point tp) {
-    {
         time_t tnow = log_clock::to_time_t(tp);
         return spdlog::details::os::localtime(tnow);
     }
 
-    log_clock::time_point next_rotation_tp_()
+    log_clock::time_point next_rotation_tp_() {
-    {
         auto now = log_clock::now();
         tm date = now_tm(now);
         date.tm_min = 0;
         date.tm_sec = 0;
         auto rotation_time = log_clock::from_time_t(std::mktime(&date));
-        if (rotation_time > now)
+        if (rotation_time > now) {
-        {
             return rotation_time;
         }
         return {rotation_time + std::chrono::hours(1)};
@@ -151,21 +134,19 @@ private:
 
     // Delete the file N rotations ago.
     // Throw spdlog_ex on failure to delete the old file.
-    void delete_old_()
+    void delete_old_() {
-    {
         using details::os::filename_to_str;
         using details::os::remove_if_exists;
 
         filename_t current_file = file_helper_.filename();
-        if (filenames_q_.full())
+        if (filenames_q_.full()) {
-        {
             auto old_filename = std::move(filenames_q_.front());
             filenames_q_.pop_front();
             bool ok = remove_if_exists(old_filename) == 0;
-            if (!ok)
+            if (!ok) {
-            {
                 filenames_q_.push_back(std::move(current_file));
-                SPDLOG_THROW(spdlog_ex("Failed removing hourly file " + filename_to_str(old_filename), errno));
+                SPDLOG_THROW(spdlog_ex(
+                    "Failed removing hourly file " + filename_to_str(old_filename), errno));
             }
         }
         filenames_q_.push_back(std::move(current_file));
@@ -183,22 +164,28 @@ private:
 using hourly_file_sink_mt = hourly_file_sink<std::mutex>;
 using hourly_file_sink_st = hourly_file_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> hourly_logger_mt(const std::string &logger_name, const filename_t &filename, bool truncate = false,
+inline std::shared_ptr<logger> hourly_logger_mt(const std::string &logger_name,
-    uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                                const filename_t &filename,
-{
+                                                bool truncate = false,
-    return Factory::template create<sinks::hourly_file_sink_mt>(logger_name, filename, truncate, max_files, event_handlers);
+                                                uint16_t max_files = 0,
+                                                const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::hourly_file_sink_mt>(logger_name, filename, truncate,
+                                                                max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> hourly_logger_st(const std::string &logger_name, const filename_t &filename, bool truncate = false,
+inline std::shared_ptr<logger> hourly_logger_st(const std::string &logger_name,
-    uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                                const filename_t &filename,
-{
+                                                bool truncate = false,
-    return Factory::template create<sinks::hourly_file_sink_st>(logger_name, filename, truncate, max_files, event_handlers);
+                                                uint16_t max_files = 0,
+                                                const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::hourly_file_sink_st>(logger_name, filename, truncate,
+                                                                max_files, event_handlers);
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/kafka_sink.h

@@ -10,13 +10,13 @@
 // https://github.com/confluentinc/librdkafka
 //
 
-#include <spdlog/common.h>
-#include "spdlog/details/log_msg.h"
-#include "spdlog/sinks/base_sink.h"
-#include "spdlog/details/synchronous_factory.h"
-#include "spdlog/details/null_mutex.h"
 #include "spdlog/async.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/details/synchronous_factory.h"
+#include "spdlog/sinks/base_sink.h"
 #include <mutex>
+#include <spdlog/common.h>
 
 // kafka header
 #include <librdkafka/rdkafkacpp.h>
@@ -24,74 +24,60 @@
 namespace spdlog {
 namespace sinks {
 
-struct kafka_sink_config
+struct kafka_sink_config {
-{
     std::string server_addr;
     std::string produce_topic;
     int32_t flush_timeout_ms = 1000;
 
     kafka_sink_config(std::string addr, std::string topic, int flush_timeout_ms = 1000)
-        : server_addr{std::move(addr)}
+        : server_addr{std::move(addr)},
-        , produce_topic{std::move(topic)}
+          produce_topic{std::move(topic)},
-        , flush_timeout_ms(flush_timeout_ms)
+          flush_timeout_ms(flush_timeout_ms) {}
-    {}
 };
 
-template<typename Mutex>
+template <typename Mutex>
-class kafka_sink : public base_sink<Mutex>
+class kafka_sink : public base_sink<Mutex> {
-{
 public:
     kafka_sink(kafka_sink_config config)
-        : config_{std::move(config)}
+        : config_{std::move(config)} {
-    {
+        try {
-        try
-        {
             std::string errstr;
             conf_.reset(RdKafka::Conf::create(RdKafka::Conf::CONF_GLOBAL));
-            RdKafka::Conf::ConfResult confRes = conf_->set("bootstrap.servers", config_.server_addr, errstr);
+            RdKafka::Conf::ConfResult confRes =
-            if (confRes != RdKafka::Conf::CONF_OK)
+                conf_->set("bootstrap.servers", config_.server_addr, errstr);
-            {
+            if (confRes != RdKafka::Conf::CONF_OK) {
-                throw_spdlog_ex(fmt_lib::format("conf set bootstrap.servers failed err:{}", errstr));
+                throw_spdlog_ex(
+                    fmt_lib::format("conf set bootstrap.servers failed err:{}", errstr));
             }
 
             tconf_.reset(RdKafka::Conf::create(RdKafka::Conf::CONF_TOPIC));
-            if (tconf_ == nullptr)
+            if (tconf_ == nullptr) {
-            {
                 throw_spdlog_ex(fmt_lib::format("create topic config failed"));
             }
 
             producer_.reset(RdKafka::Producer::create(conf_.get(), errstr));
-            if (producer_ == nullptr)
+            if (producer_ == nullptr) {
-            {
                 throw_spdlog_ex(fmt_lib::format("create producer failed err:{}", errstr));
             }
-            topic_.reset(RdKafka::Topic::create(producer_.get(), config_.produce_topic, tconf_.get(), errstr));
+            topic_.reset(RdKafka::Topic::create(producer_.get(), config_.produce_topic,
-            if (topic_ == nullptr)
+                                                tconf_.get(), errstr));
-            {
+            if (topic_ == nullptr) {
                 throw_spdlog_ex(fmt_lib::format("create topic failed err:{}", errstr));
             }
-        }
+        } catch (const std::exception &e) {
-        catch (const std::exception &e)
-        {
             throw_spdlog_ex(fmt_lib::format("error create kafka instance: {}", e.what()));
         }
     }
 
-    ~kafka_sink()
+    ~kafka_sink() { producer_->flush(config_.flush_timeout_ms); }
-    {
-        producer_->flush(config_.flush_timeout_ms);
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
+        producer_->produce(topic_.get(), 0, RdKafka::Producer::RK_MSG_COPY,
-        producer_->produce(topic_.get(), 0, RdKafka::Producer::RK_MSG_COPY, (void *)msg.payload.data(), msg.payload.size(), NULL, NULL);
+                           (void *)msg.payload.data(), msg.payload.size(), NULL, NULL);
     }
 
-    void flush_() override
+    void flush_() override { producer_->flush(config_.flush_timeout_ms); }
-    {
-        producer_->flush(config_.flush_timeout_ms);
-    }
 
 private:
     kafka_sink_config config_;
@@ -104,30 +90,30 @@ private:
 using kafka_sink_mt = kafka_sink<std::mutex>;
 using kafka_sink_st = kafka_sink<spdlog::details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> kafka_logger_mt(const std::string &logger_name, spdlog::sinks::kafka_sink_config config)
+inline std::shared_ptr<logger> kafka_logger_mt(const std::string &logger_name,
-{
+                                               spdlog::sinks::kafka_sink_config config) {
     return Factory::template create<sinks::kafka_sink_mt>(logger_name, config);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> kafka_logger_st(const std::string &logger_name, spdlog::sinks::kafka_sink_config config)
+inline std::shared_ptr<logger> kafka_logger_st(const std::string &logger_name,
-{
+                                               spdlog::sinks::kafka_sink_config config) {
     return Factory::template create<sinks::kafka_sink_st>(logger_name, config);
 }
 
-template<typename Factory = spdlog::async_factory>
+template <typename Factory = spdlog::async_factory>
-inline std::shared_ptr<spdlog::logger> kafka_logger_async_mt(std::string logger_name, spdlog::sinks::kafka_sink_config config)
+inline std::shared_ptr<spdlog::logger> kafka_logger_async_mt(
-{
+    std::string logger_name, spdlog::sinks::kafka_sink_config config) {
     return Factory::template create<sinks::kafka_sink_mt>(logger_name, config);
 }
 
-template<typename Factory = spdlog::async_factory>
+template <typename Factory = spdlog::async_factory>
-inline std::shared_ptr<spdlog::logger> kafka_logger_async_st(std::string logger_name, spdlog::sinks::kafka_sink_config config)
+inline std::shared_ptr<spdlog::logger> kafka_logger_async_st(
-{
+    std::string logger_name, spdlog::sinks::kafka_sink_config config) {
     return Factory::template create<sinks::kafka_sink_st>(logger_name, config);
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/mongo_sink.h

@@ -25,51 +25,46 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class mongo_sink : public base_sink<Mutex>
+class mongo_sink : public base_sink<Mutex> {
-{
 public:
-    mongo_sink(const std::string &db_name, const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+    mongo_sink(const std::string &db_name,
-    try : mongo_sink(std::make_shared<mongocxx::instance>(), db_name, collection_name, uri)
+               const std::string &collection_name,
-    {}
+               const std::string &uri = "mongodb://localhost:27017") try
-    catch (const std::exception &e)
+        : mongo_sink(std::make_shared<mongocxx::instance>(), db_name, collection_name, uri) {
-    {
+    } catch (const std::exception &e) {
         throw_spdlog_ex(fmt_lib::format("Error opening database: {}", e.what()));
     }
 
-    mongo_sink(std::shared_ptr<mongocxx::instance> instance, const std::string &db_name, const std::string &collection_name,
+    mongo_sink(std::shared_ptr<mongocxx::instance> instance,
-        const std::string &uri = "mongodb://localhost:27017")
+               const std::string &db_name,
-        : instance_(std::move(instance))
+               const std::string &collection_name,
-        , db_name_(db_name)
+               const std::string &uri = "mongodb://localhost:27017")
-        , coll_name_(collection_name)
+        : instance_(std::move(instance)),
-    {
+          db_name_(db_name),
-        try
+          coll_name_(collection_name) {
-        {
+        try {
             client_ = spdlog::details::make_unique<mongocxx::client>(mongocxx::uri{uri});
-        }
+        } catch (const std::exception &e) {
-        catch (const std::exception &e)
-        {
             throw_spdlog_ex(fmt_lib::format("Error opening database: {}", e.what()));
         }
     }
 
-    ~mongo_sink()
+    ~mongo_sink() { flush_(); }
-    {
-        flush_();
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         using bsoncxx::builder::stream::document;
         using bsoncxx::builder::stream::finalize;
 
-        if (client_ != nullptr)
+        if (client_ != nullptr) {
-        {
+            auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level"
-            auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level" << level::to_string_view(msg.level).data()
+                                  << level::to_string_view(msg.level).data() << "level_num"
-                                  << "level_num" << msg.level << "message" << std::string(msg.payload.begin(), msg.payload.end())
+                                  << msg.level << "message"
-                                  << "logger_name" << std::string(msg.logger_name.begin(), msg.logger_name.end()) << "thread_id"
+                                  << std::string(msg.payload.begin(), msg.payload.end())
-                                  << static_cast<int>(msg.thread_id) << finalize;
+                                  << "logger_name"
+                                  << std::string(msg.logger_name.begin(), msg.logger_name.end())
+                                  << "thread_id" << static_cast<int>(msg.thread_id) << finalize;
             client_->database(db_name_).collection(coll_name_).insert_one(doc.view());
         }
     }
@@ -88,20 +83,26 @@ private:
 using mongo_sink_mt = mongo_sink<std::mutex>;
 using mongo_sink_st = mongo_sink<spdlog::details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> mongo_logger_mt(const std::string &logger_name, const std::string &db_name,
+inline std::shared_ptr<logger> mongo_logger_mt(
-    const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+    const std::string &logger_name,
-{
+    const std::string &db_name,
-    return Factory::template create<sinks::mongo_sink_mt>(logger_name, db_name, collection_name, uri);
+    const std::string &collection_name,
+    const std::string &uri = "mongodb://localhost:27017") {
+    return Factory::template create<sinks::mongo_sink_mt>(logger_name, db_name, collection_name,
+                                                          uri);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> mongo_logger_st(const std::string &logger_name, const std::string &db_name,
+inline std::shared_ptr<logger> mongo_logger_st(
-    const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+    const std::string &logger_name,
-{
+    const std::string &db_name,
-    return Factory::template create<sinks::mongo_sink_st>(logger_name, db_name, collection_name, uri);
+    const std::string &collection_name,
+    const std::string &uri = "mongodb://localhost:27017") {
+    return Factory::template create<sinks::mongo_sink_st>(logger_name, db_name, collection_name,
+                                                          uri);
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/msvc_sink.h

@@ -5,21 +5,21 @@
 
 #if defined(_WIN32)
 
-#    include <spdlog/details/null_mutex.h>
+    #include <spdlog/details/null_mutex.h>
-#    if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-#        include <spdlog/details/os.h>
+        #include <spdlog/details/os.h>
-#    endif
+    #endif
-#    include <spdlog/sinks/base_sink.h>
+    #include <spdlog/sinks/base_sink.h>
 
-#    include <mutex>
+    #include <mutex>
-#    include <string>
+    #include <string>
 
-// Avoid including windows.h (https://stackoverflow.com/a/30741042)
+    // Avoid including windows.h (https://stackoverflow.com/a/30741042)
-#    if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 extern "C" __declspec(dllimport) void __stdcall OutputDebugStringW(const wchar_t *lpOutputString);
-#    else
+    #else
 extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
-#    endif
+    #endif
 extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
 
 namespace spdlog {
@@ -27,31 +27,28 @@ namespace sinks {
 /*
  * MSVC sink (logging using OutputDebugStringA)
  */
-template<typename Mutex>
+template <typename Mutex>
-class msvc_sink : public base_sink<Mutex>
+class msvc_sink : public base_sink<Mutex> {
-{
 public:
     msvc_sink() = default;
     msvc_sink(bool check_debugger_present)
         : check_debugger_present_{check_debugger_present} {};
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
+        if (check_debugger_present_ && !IsDebuggerPresent()) {
-        if (check_debugger_present_ && !IsDebuggerPresent())
-        {
             return;
         }
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
-        formatted.push_back('\0'); // add a null terminator for OutputDebugString
+        formatted.push_back('\0');  // add a null terminator for OutputDebugString
-#    if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
         wmemory_buf_t wformatted;
         details::os::utf8_to_wstrbuf(string_view_t(formatted.data(), formatted.size()), wformatted);
         OutputDebugStringW(wformatted.data());
-#    else
+    #else
         OutputDebugStringA(formatted.data());
-#    endif
+    #endif
     }
 
     void flush_() override {}
@@ -65,7 +62,7 @@ using msvc_sink_st = msvc_sink<details::null_mutex>;
 using windebug_sink_mt = msvc_sink_mt;
 using windebug_sink_st = msvc_sink_st;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog
 
 #endif

include/spdlog/sinks/null_sink.h

@@ -4,17 +4,16 @@
 #pragma once
 
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <mutex>
 
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
-class null_sink : public base_sink<Mutex>
+class null_sink : public base_sink<Mutex> {
-{
 protected:
     void sink_it_(const details::log_msg &) override {}
     void flush_() override {}
@@ -23,22 +22,20 @@ protected:
 using null_sink_mt = null_sink<details::null_mutex>;
 using null_sink_st = null_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> null_logger_mt(const std::string &logger_name)
+inline std::shared_ptr<logger> null_logger_mt(const std::string &logger_name) {
-{
     auto null_logger = Factory::template create<sinks::null_sink_mt>(logger_name);
     null_logger->set_level(level::off);
     return null_logger;
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> null_logger_st(const std::string &logger_name)
+inline std::shared_ptr<logger> null_logger_st(const std::string &logger_name) {
-{
     auto null_logger = Factory::template create<sinks::null_sink_st>(logger_name);
     null_logger->set_level(level::off);
     return null_logger;
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/ostream_sink.h

@@ -11,33 +11,26 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class ostream_sink final : public base_sink<Mutex>
+class ostream_sink final : public base_sink<Mutex> {
-{
 public:
     explicit ostream_sink(std::ostream &os, bool force_flush = false)
-        : ostream_(os)
+        : ostream_(os),
-        , force_flush_(force_flush)
+          force_flush_(force_flush) {}
-    {}
     ostream_sink(const ostream_sink &) = delete;
     ostream_sink &operator=(const ostream_sink &) = delete;
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
         ostream_.write(formatted.data(), static_cast<std::streamsize>(formatted.size()));
-        if (force_flush_)
+        if (force_flush_) {
-        {
             ostream_.flush();
         }
     }
 
-    void flush_() override
+    void flush_() override { ostream_.flush(); }
-    {
-        ostream_.flush();
-    }
 
     std::ostream &ostream_;
     bool force_flush_;
@@ -46,5 +39,5 @@ protected:
 using ostream_sink_mt = ostream_sink<std::mutex>;
 using ostream_sink_st = ostream_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/qt_sinks.h

@@ -8,8 +8,8 @@
 // etc) Building and using requires Qt library.
 //
 // Warning: the qt_sink won't be notified if the target widget is destroyed.
-// If the widget's lifetime can be shorter than the logger's one, you should provide some permanent QObject,
+// If the widget's lifetime can be shorter than the logger's one, you should provide some permanent
-// and then use a standard signal/slot.
+// QObject, and then use a standard signal/slot.
 //
 
 #include "spdlog/common.h"
@@ -18,40 +18,34 @@
 #include "spdlog/sinks/base_sink.h"
 #include <array>
 
-#include <QTextEdit>
 #include <QPlainTextEdit>
+#include <QTextEdit>
 
 //
 // qt_sink class
 //
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class qt_sink : public base_sink<Mutex>
+class qt_sink : public base_sink<Mutex> {
-{
 public:
     qt_sink(QObject *qt_object, std::string meta_method)
-        : qt_object_(qt_object)
+        : qt_object_(qt_object),
-        , meta_method_(std::move(meta_method))
+          meta_method_(std::move(meta_method)) {
-    {
+        if (!qt_object_) {
-        if (!qt_object_)
-        {
             throw_spdlog_ex("qt_sink: qt_object is null");
         }
     }
 
-    ~qt_sink()
+    ~qt_sink() { flush_(); }
-    {
-        flush_();
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
         const string_view_t str = string_view_t(formatted.data(), formatted.size());
-        QMetaObject::invokeMethod(qt_object_, meta_method_.c_str(), Qt::AutoConnection,
+        QMetaObject::invokeMethod(
+            qt_object_, meta_method_.c_str(), Qt::AutoConnection,
             Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
     }
 
@@ -65,18 +59,20 @@ private:
 // QT color sink to QTextEdit.
 // Color location is determined by the sink log pattern like in the rest of spdlog sinks.
 // Colors can be modified if needed using sink->set_color(level, qtTextCharFormat).
-// max_lines is the maximum number of lines that the sink will hold before removing the oldest lines.
+// max_lines is the maximum number of lines that the sink will hold before removing the oldest
-// Note: Only ascii (latin1) is supported by this sink.
+// lines. By default, only ascii (latin1) is supported by this sink. Set is_utf8 to true if utf8
-template<typename Mutex>
+// support is needed.
-class qt_color_sink : public base_sink<Mutex>
+template <typename Mutex>
-{
+class qt_color_sink : public base_sink<Mutex> {
 public:
-    qt_color_sink(QTextEdit *qt_text_edit, int max_lines)
+    qt_color_sink(QTextEdit *qt_text_edit,
-        : qt_text_edit_(qt_text_edit)
+                  int max_lines,
-        , max_lines_(max_lines)
+                  bool dark_colors = false,
-    {
+                  bool is_utf8 = false)
-        if (!qt_text_edit_)
+        : qt_text_edit_(qt_text_edit),
-        {
+          max_lines_(max_lines),
+          is_utf8_(is_utf8) {
+        if (!qt_text_edit_) {
             throw_spdlog_ex("qt_color_text_sink: text_edit is null");
         }
 
@@ -84,16 +80,16 @@ public:
         // set colors
         QTextCharFormat format;
         // trace
-        format.setForeground(Qt::gray);
+        format.setForeground(dark_colors ? Qt::darkGray : Qt::gray);
         colors_.at(level::trace) = format;
         // debug
-        format.setForeground(Qt::cyan);
+        format.setForeground(dark_colors ? Qt::darkCyan : Qt::cyan);
         colors_.at(level::debug) = format;
         // info
-        format.setForeground(Qt::green);
+        format.setForeground(dark_colors ? Qt::darkGreen : Qt::green);
         colors_.at(level::info) = format;
         // warn
-        format.setForeground(Qt::yellow);
+        format.setForeground(dark_colors ? Qt::darkYellow : Qt::yellow);
         colors_.at(level::warn) = format;
         // err
         format.setForeground(Qt::red);
@@ -104,48 +100,44 @@ public:
         colors_.at(level::critical) = format;
     }
 
-    ~qt_color_sink()
+    ~qt_color_sink() { flush_(); }
-    {
-        flush_();
-    }
 
-    void set_default_color(QTextCharFormat format)
+    void set_default_color(QTextCharFormat format) {
-    {
         // std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         default_color_ = format;
     }
 
-    void set_level_color(level::level_enum color_level, QTextCharFormat format)
+    void set_level_color(level::level_enum color_level, QTextCharFormat format) {
-    {
         // std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         colors_.at(static_cast<size_t>(color_level)) = format;
     }
 
-    QTextCharFormat &get_level_color(level::level_enum color_level)
+    QTextCharFormat &get_level_color(level::level_enum color_level) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         return colors_.at(static_cast<size_t>(color_level));
     }
 
-    QTextCharFormat &get_default_color()
+    QTextCharFormat &get_default_color() {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         return default_color_;
     }
 
 protected:
-    struct invoke_params
+    struct invoke_params {
-    {
+        invoke_params(int max_lines,
-        invoke_params(int max_lines, QTextEdit *q_text_edit, QString payload, QTextCharFormat default_color, QTextCharFormat level_color,
+                      QTextEdit *q_text_edit,
-            int color_range_start, int color_range_end)
+                      QString payload,
-            : max_lines(max_lines)
+                      QTextCharFormat default_color,
-            , q_text_edit(q_text_edit)
+                      QTextCharFormat level_color,
-            , payload(std::move(payload))
+                      int color_range_start,
-            , default_color(default_color)
+                      int color_range_end)
-            , level_color(level_color)
+            : max_lines(max_lines),
-            , color_range_start(color_range_start)
+              q_text_edit(q_text_edit),
-            , color_range_end(color_range_end)
+              payload(std::move(payload)),
-        {}
+              default_color(default_color),
+              level_color(level_color),
+              color_range_start(color_range_start),
+              color_range_end(color_range_end) {}
         int max_lines;
         QTextEdit *q_text_edit;
         QString payload;
@@ -155,22 +147,33 @@ protected:
         int color_range_end;
     };
 
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
 
         const string_view_t str = string_view_t(formatted.data(), formatted.size());
         // apply the color to the color range in the formatted message.
-        auto payload = QString::fromLatin1(str.data(), static_cast<int>(str.size()));
+        QString payload;
+        int color_range_start = static_cast<int>(msg.color_range_start);
+        int color_range_end = static_cast<int>(msg.color_range_end);
+        if (is_utf8_) {
+            payload = QString::fromUtf8(str.data(), static_cast<int>(str.size()));
+            // convert color ranges from byte index to character index.
+            if (msg.color_range_start < msg.color_range_end) {
+                color_range_start = QString::fromUtf8(str.data(), msg.color_range_start).size();
+                color_range_end = QString::fromUtf8(str.data(), msg.color_range_end).size();
+            }
+        } else {
+            payload = QString::fromLatin1(str.data(), static_cast<int>(str.size()));
+        }
 
         invoke_params params{max_lines_,             // max lines
-            qt_text_edit_,                           // text edit to append to
+                             qt_text_edit_,          // text edit to append to
-            std::move(payload),                      // text to append
+                             std::move(payload),     // text to append
-            default_color_,                          // default color
+                             default_color_,         // default color
-            colors_.at(msg.level),                   // color to apply
+                             colors_.at(msg.level),  // color to apply
-            static_cast<int>(msg.color_range_start), // color range start
+                             color_range_start,      // color range start
-            static_cast<int>(msg.color_range_end)};  // color range end
+                             color_range_end};       // color range end
 
         QMetaObject::invokeMethod(
             qt_text_edit_, [params]() { invoke_method_(params); }, Qt::AutoConnection);
@@ -179,28 +182,25 @@ protected:
     void flush_() override {}
 
     // Add colored text to the text edit widget. This method is invoked in the GUI thread.
-    // It is a static method to ensure that it is handled correctly even if the sink is destroyed prematurely
+    // It is a static method to ensure that it is handled correctly even if the sink is destroyed
-    // before it is invoked.
+    // prematurely before it is invoked.
 
-    static void invoke_method_(invoke_params params)
+    static void invoke_method_(invoke_params params) {
-    {
         auto *document = params.q_text_edit->document();
         QTextCursor cursor(document);
 
         // remove first blocks if number of blocks exceeds max_lines
-        while (document->blockCount() > params.max_lines)
+        while (document->blockCount() > params.max_lines) {
-        {
             cursor.select(QTextCursor::BlockUnderCursor);
             cursor.removeSelectedText();
-            cursor.deleteChar(); // delete the newline after the block
+            cursor.deleteChar();  // delete the newline after the block
         }
 
         cursor.movePosition(QTextCursor::End);
         cursor.setCharFormat(params.default_color);
 
         // if color range not specified or not not valid, just append the text with default color
-        if (params.color_range_end <= params.color_range_start)
+        if (params.color_range_end <= params.color_range_start) {
-        {
             cursor.insertText(params.payload);
             return;
         }
@@ -210,7 +210,8 @@ protected:
 
         // insert the colorized text
         cursor.setCharFormat(params.level_color);
-        cursor.insertText(params.payload.mid(params.color_range_start, params.color_range_end - params.color_range_start));
+        cursor.insertText(params.payload.mid(params.color_range_start,
+                                             params.color_range_end - params.color_range_start));
 
         // insert the text after the color range with default format
         cursor.setCharFormat(params.default_color);
@@ -219,6 +220,7 @@ protected:
 
     QTextEdit *qt_text_edit_;
     int max_lines_;
+    bool is_utf8_;
     QTextCharFormat default_color_;
     std::array<QTextCharFormat, level::n_levels> colors_;
 };
@@ -230,63 +232,73 @@ 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>;
 using qt_color_sink_st = qt_color_sink<details::null_mutex>;
-} // namespace sinks
+}  // namespace sinks
 
 //
 // Factory functions
 //
 
 // log to QTextEdit
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name, QTextEdit *qt_object, const std::string &meta_method = "append")
+inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name,
-{
+                                            QTextEdit *qt_object,
+                                            const std::string &meta_method = "append") {
     return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name, QTextEdit *qt_object, const std::string &meta_method = "append")
+inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name,
-{
+                                            QTextEdit *qt_object,
+                                            const std::string &meta_method = "append") {
     return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 }
 
 // log to QPlainTextEdit
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_mt(
+inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name,
-    const std::string &logger_name, QPlainTextEdit *qt_object, const std::string &meta_method = "appendPlainText")
+                                            QPlainTextEdit *qt_object,
-{
+                                            const std::string &meta_method = "appendPlainText") {
     return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_st(
+inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name,
-    const std::string &logger_name, QPlainTextEdit *qt_object, const std::string &meta_method = "appendPlainText")
+                                            QPlainTextEdit *qt_object,
-{
+                                            const std::string &meta_method = "appendPlainText") {
     return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 }
 // log to QObject
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name, QObject *qt_object, const std::string &meta_method)
+inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name,
-{
+                                            QObject *qt_object,
+                                            const std::string &meta_method) {
     return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name, QObject *qt_object, const std::string &meta_method)
+inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name,
-{
+                                            QObject *qt_object,
+                                            const std::string &meta_method) {
     return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 }
 
 // log to QTextEdit with colorize output
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_color_logger_mt(const std::string &logger_name, QTextEdit *qt_text_edit, int max_lines)
+inline std::shared_ptr<logger> qt_color_logger_mt(const std::string &logger_name,
-{
+                                                  QTextEdit *qt_text_edit,
-    return Factory::template create<sinks::qt_color_sink_mt>(logger_name, qt_text_edit, max_lines);
+                                                  int max_lines,
+                                                  bool is_utf8 = false) {
+    return Factory::template create<sinks::qt_color_sink_mt>(logger_name, qt_text_edit, max_lines,
+                                                             false, is_utf8);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_color_logger_st(const std::string &logger_name, QTextEdit *qt_text_edit, int max_lines)
+inline std::shared_ptr<logger> qt_color_logger_st(const std::string &logger_name,
-{
+                                                  QTextEdit *qt_text_edit,
-    return Factory::template create<sinks::qt_color_sink_st>(logger_name, qt_text_edit, max_lines);
+                                                  int max_lines,
+                                                  bool is_utf8 = false) {
+    return Factory::template create<sinks::qt_color_sink_st>(logger_name, qt_text_edit, max_lines,
+                                                             false, is_utf8);
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/ringbuffer_sink.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "spdlog/sinks/base_sink.h"
 #include "spdlog/details/circular_q.h"
 #include "spdlog/details/log_msg_buffer.h"
 #include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/base_sink.h"
 
 #include <mutex>
 #include <string>
@@ -17,37 +17,31 @@ namespace sinks {
 /*
  * Ring buffer sink
  */
-template<typename Mutex>
+template <typename Mutex>
-class ringbuffer_sink final : public base_sink<Mutex>
+class ringbuffer_sink final : public base_sink<Mutex> {
-{
 public:
     explicit ringbuffer_sink(size_t n_items)
-        : q_{n_items}
+        : q_{n_items} {}
-    {}
 
-    std::vector<details::log_msg_buffer> last_raw(size_t lim = 0)
+    std::vector<details::log_msg_buffer> last_raw(size_t lim = 0) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         auto items_available = q_.size();
         auto n_items = lim > 0 ? (std::min)(lim, items_available) : items_available;
         std::vector<details::log_msg_buffer> ret;
         ret.reserve(n_items);
-        for (size_t i = (items_available - n_items); i < items_available; i++)
+        for (size_t i = (items_available - n_items); i < items_available; i++) {
-        {
             ret.push_back(q_.at(i));
         }
         return ret;
     }
 
-    std::vector<std::string> last_formatted(size_t lim = 0)
+    std::vector<std::string> last_formatted(size_t lim = 0) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         auto items_available = q_.size();
         auto n_items = lim > 0 ? (std::min)(lim, items_available) : items_available;
         std::vector<std::string> ret;
         ret.reserve(n_items);
-        for (size_t i = (items_available - n_items); i < items_available; i++)
+        for (size_t i = (items_available - n_items); i < items_available; i++) {
-        {
             memory_buf_t formatted;
             base_sink<Mutex>::formatter_->format(q_.at(i), formatted);
             ret.push_back(SPDLOG_BUF_TO_STRING(formatted));
@@ -56,8 +50,7 @@ public:
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         q_.push_back(details::log_msg_buffer{msg});
     }
     void flush_() override {}
@@ -69,6 +62,6 @@ private:
 using ringbuffer_sink_mt = ringbuffer_sink<std::mutex>;
 using ringbuffer_sink_st = ringbuffer_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/rotating_file_sink-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/rotating_file_sink.h>
+    #include <spdlog/sinks/rotating_file_sink.h>
 #endif
 
 #include <spdlog/common.h>
@@ -23,27 +23,27 @@
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
 SPDLOG_INLINE rotating_file_sink<Mutex>::rotating_file_sink(
-    filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open, const file_event_handlers &event_handlers)
+    filename_t base_filename,
-    : base_filename_(std::move(base_filename))
+    std::size_t max_size,
-    , max_size_(max_size)
+    std::size_t max_files,
-    , max_files_(max_files)
+    bool rotate_on_open,
-    , file_helper_{event_handlers}
+    const file_event_handlers &event_handlers)
-{
+    : base_filename_(std::move(base_filename)),
-    if (max_size == 0)
+      max_size_(max_size),
-    {
+      max_files_(max_files),
+      file_helper_{event_handlers} {
+    if (max_size == 0) {
         throw_spdlog_ex("rotating sink constructor: max_size arg cannot be zero");
     }
 
-    if (max_files > 200000)
+    if (max_files > 200000) {
-    {
         throw_spdlog_ex("rotating sink constructor: max_files arg cannot exceed 200000");
     }
     file_helper_.open(calc_filename(base_filename_, 0));
-    current_size_ = file_helper_.size(); // expensive. called only once
+    current_size_ = file_helper_.size();  // expensive. called only once
-    if (rotate_on_open && current_size_ > 0)
+    if (rotate_on_open && current_size_ > 0) {
-    {
         rotate_();
         current_size_ = 0;
     }
@@ -51,11 +51,10 @@ SPDLOG_INLINE rotating_file_sink<Mutex>::rotating_file_sink(
 
 // calc filename according to index and file extension if exists.
 // e.g. calc_filename("logs/mylog.txt, 3) => "logs/mylog.3.txt".
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename_t &filename, std::size_t index)
+SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename_t &filename,
-{
+                                                                  std::size_t index) {
-    if (index == 0u)
+    if (index == 0u) {
-    {
         return filename;
     }
 
@@ -64,16 +63,14 @@ SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename
     return fmt_lib::format(SPDLOG_FILENAME_T("{}.{}{}"), basename, index, ext);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::filename()
+SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::filename() {
-{
     std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
     return file_helper_.filename();
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &msg) {
-{
     memory_buf_t formatted;
     base_sink<Mutex>::formatter_->format(msg, formatted);
     auto new_size = current_size_ + formatted.size();
@@ -81,11 +78,9 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &m
     // rotate if the new estimated file size exceeds max size.
     // rotate only if the real size > 0 to better deal with full disk (see issue #2261).
     // we only check the real size when new_size > max_size_ because it is relatively expensive.
-    if (new_size > max_size_)
+    if (new_size > max_size_) {
-    {
         file_helper_.flush();
-        if (file_helper_.size() > 0)
+        if (file_helper_.size() > 0) {
-        {
             rotate_();
             new_size = formatted.size();
         }
@@ -94,9 +89,8 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &m
     current_size_ = new_size;
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::flush_()
+SPDLOG_INLINE void rotating_file_sink<Mutex>::flush_() {
-{
     file_helper_.flush();
 }
 
@@ -105,33 +99,31 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::flush_()
 // log.1.txt -> log.2.txt
 // log.2.txt -> log.3.txt
 // log.3.txt -> delete
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_()
+SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_() {
-{
     using details::os::filename_to_str;
     using details::os::path_exists;
 
     file_helper_.close();
-    for (auto i = max_files_; i > 0; --i)
+    for (auto i = max_files_; i > 0; --i) {
-    {
         filename_t src = calc_filename(base_filename_, i - 1);
-        if (!path_exists(src))
+        if (!path_exists(src)) {
-        {
             continue;
         }
         filename_t target = calc_filename(base_filename_, i);
 
-        if (!rename_file_(src, target))
+        if (!rename_file_(src, target)) {
-        {
             // if failed try again after a small delay.
             // this is a workaround to a windows issue, where very high rotation
             // rates can cause the rename to fail with permission denied (because of antivirus?).
             details::os::sleep_for_millis(100);
-            if (!rename_file_(src, target))
+            if (!rename_file_(src, target)) {
-            {
+                file_helper_.reopen(
-                file_helper_.reopen(true); // truncate the log file anyway to prevent it to grow beyond its limit!
+                    true);  // truncate the log file anyway to prevent it to grow beyond its limit!
                 current_size_ = 0;
-                throw_spdlog_ex("rotating_file_sink: failed renaming " + filename_to_str(src) + " to " + filename_to_str(target), errno);
+                throw_spdlog_ex("rotating_file_sink: failed renaming " + filename_to_str(src) +
+                                    " to " + filename_to_str(target),
+                                errno);
             }
         }
     }
@@ -140,13 +132,13 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_()
 
 // delete the target if exists, and rename the src file  to target
 // return true on success, false otherwise.
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE bool rotating_file_sink<Mutex>::rename_file_(const filename_t &src_filename, const filename_t &target_filename)
+SPDLOG_INLINE bool rotating_file_sink<Mutex>::rename_file_(const filename_t &src_filename,
-{
+                                                           const filename_t &target_filename) {
     // try to delete the target file in case it already exists.
     (void)details::os::remove(target_filename);
     return details::os::rename(src_filename, target_filename) == 0;
 }
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/rotating_file_sink.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <chrono>
 #include <mutex>
@@ -18,12 +18,14 @@ namespace sinks {
 //
 // Rotating file sink based on size
 //
-template<typename Mutex>
+template <typename Mutex>
-class rotating_file_sink final : public base_sink<Mutex>
+class rotating_file_sink final : public base_sink<Mutex> {
-{
 public:
-    rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open = false,
+    rotating_file_sink(filename_t base_filename,
-        const file_event_handlers &event_handlers = {});
+                       std::size_t max_size,
+                       std::size_t max_files,
+                       bool rotate_on_open = false,
+                       const file_event_handlers &event_handlers = {});
     static filename_t calc_filename(const filename_t &filename, std::size_t index);
     filename_t filename();
 
@@ -53,29 +55,35 @@ private:
 using rotating_file_sink_mt = rotating_file_sink<std::mutex>;
 using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
 //
 // factory functions
 //
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name, const filename_t &filename, size_t max_file_size,
+inline std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name,
-    size_t max_files, bool rotate_on_open = false, const file_event_handlers &event_handlers = {})
+                                                  const filename_t &filename,
-{
+                                                  size_t max_file_size,
+                                                  size_t max_files,
+                                                  bool rotate_on_open = false,
+                                                  const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::rotating_file_sink_mt>(
         logger_name, filename, max_file_size, max_files, rotate_on_open, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> rotating_logger_st(const std::string &logger_name, const filename_t &filename, size_t max_file_size,
+inline std::shared_ptr<logger> rotating_logger_st(const std::string &logger_name,
-    size_t max_files, bool rotate_on_open = false, const file_event_handlers &event_handlers = {})
+                                                  const filename_t &filename,
-{
+                                                  size_t max_file_size,
+                                                  size_t max_files,
+                                                  bool rotate_on_open = false,
+                                                  const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::rotating_file_sink_st>(
         logger_name, filename, max_file_size, max_files, rotate_on_open, event_handlers);
 }
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "rotating_file_sink-inl.h"
+    #include "rotating_file_sink-inl.h"
 #endif

include/spdlog/sinks/sink-inl.h

@@ -4,22 +4,19 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/sink.h>
+    #include <spdlog/sinks/sink.h>
 #endif
 
 #include <spdlog/common.h>
 
-SPDLOG_INLINE bool spdlog::sinks::sink::should_log(spdlog::level::level_enum msg_level) const
+SPDLOG_INLINE bool spdlog::sinks::sink::should_log(spdlog::level::level_enum msg_level) const {
-{
     return msg_level >= level_.load(std::memory_order_relaxed);
 }
 
-SPDLOG_INLINE void spdlog::sinks::sink::set_level(level::level_enum log_level)
+SPDLOG_INLINE void spdlog::sinks::sink::set_level(level::level_enum log_level) {
-{
     level_.store(log_level, std::memory_order_relaxed);
 }
 
-SPDLOG_INLINE spdlog::level::level_enum spdlog::sinks::sink::level() const
+SPDLOG_INLINE spdlog::level::level_enum spdlog::sinks::sink::level() const {
-{
     return static_cast<spdlog::level::level_enum>(level_.load(std::memory_order_relaxed));
 }

include/spdlog/sinks/sink.h

@@ -9,8 +9,7 @@
 namespace spdlog {
 
 namespace sinks {
-class SPDLOG_API sink
+class SPDLOG_API sink {
-{
 public:
     virtual ~sink() = default;
     virtual void log(const details::log_msg &msg) = 0;
@@ -27,9 +26,9 @@ protected:
     level_t level_{level::trace};
 };
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "sink-inl.h"
+    #include "sink-inl.h"
 #endif

include/spdlog/sinks/stdout_color_sinks-inl.h

@@ -4,35 +4,35 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/stdout_color_sinks.h>
+    #include <spdlog/sinks/stdout_color_sinks.h>
 #endif
 
-#include <spdlog/logger.h>
 #include <spdlog/common.h>
+#include <spdlog/logger.h>
 
 namespace spdlog {
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stdout_color_sink_mt>(logger_name, mode);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_color_st(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_color_st(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stdout_color_sink_st>(logger_name, mode);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stderr_color_sink_mt>(logger_name, mode);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stderr_color_sink_st>(logger_name, mode);
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/stdout_color_sinks.h

@@ -4,9 +4,9 @@
 #pragma once
 
 #ifdef _WIN32
-#    include <spdlog/sinks/wincolor_sink.h>
+    #include <spdlog/sinks/wincolor_sink.h>
 #else
-#    include <spdlog/sinks/ansicolor_sink.h>
+    #include <spdlog/sinks/ansicolor_sink.h>
 #endif
 
 #include <spdlog/details/synchronous_factory.h>
@@ -24,22 +24,26 @@ using stdout_color_sink_st = ansicolor_stdout_sink_st;
 using stderr_color_sink_mt = ansicolor_stderr_sink_mt;
 using stderr_color_sink_st = ansicolor_stderr_sink_st;
 #endif
-} // namespace sinks
+}  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stdout_color_st(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stdout_color_st(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stderr_color_st(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "stdout_color_sinks-inl.h"
+    #include "stdout_color_sinks-inl.h"
 #endif

include/spdlog/sinks/stdout_sinks-inl.h

@@ -4,36 +4,35 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/stdout_sinks.h>
+    #include <spdlog/sinks/stdout_sinks.h>
 #endif
 
+#include <memory>
 #include <spdlog/details/console_globals.h>
 #include <spdlog/pattern_formatter.h>
-#include <memory>
 
 #ifdef _WIN32
-// under windows using fwrite to non-binary stream results in \r\r\n (see issue #1675)
+    // under windows using fwrite to non-binary stream results in \r\r\n (see issue #1675)
-// so instead we use ::FileWrite
+    // so instead we use ::FileWrite
-#    include <spdlog/details/windows_include.h>
+    #include <spdlog/details/windows_include.h>
 
-#    ifndef _USING_V110_SDK71_ // fileapi.h doesn't exist in winxp
+    #ifndef _USING_V110_SDK71_  // fileapi.h doesn't exist in winxp
-#        include <fileapi.h>   // WriteFile (..)
+        #include <fileapi.h>    // WriteFile (..)
-#    endif
+    #endif
 
-#    include <io.h>    // _get_osfhandle(..)
+    #include <io.h>     // _get_osfhandle(..)
-#    include <stdio.h> // _fileno(..)
+    #include <stdio.h>  // _fileno(..)
-#endif                 // WIN32
+#endif                  // WIN32
 
 namespace spdlog {
 
 namespace sinks {
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE stdout_sink_base<ConsoleMutex>::stdout_sink_base(FILE *file)
-    : mutex_(ConsoleMutex::mutex())
+    : mutex_(ConsoleMutex::mutex()),
-    , file_(file)
+      file_(file),
-    , formatter_(details::make_unique<spdlog::pattern_formatter>())
+      formatter_(details::make_unique<spdlog::pattern_formatter>()) {
-{
 #ifdef _WIN32
     // get windows handle from the FILE* object
 
@@ -42,19 +41,16 @@ SPDLOG_INLINE stdout_sink_base<ConsoleMutex>::stdout_sink_base(FILE *file)
     // don't throw to support cases where no console is attached,
     // and let the log method to do nothing if (handle_ == INVALID_HANDLE_VALUE).
     // throw only if non stdout/stderr target is requested (probably regular file and not console).
-    if (handle_ == INVALID_HANDLE_VALUE && file != stdout && file != stderr)
+    if (handle_ == INVALID_HANDLE_VALUE && file != stdout && file != stderr) {
-    {
         throw_spdlog_ex("spdlog::stdout_sink_base: _get_osfhandle() failed", errno);
     }
-#endif // WIN32
+#endif  // WIN32
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &msg)
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &msg) {
-{
 #ifdef _WIN32
-    if (handle_ == INVALID_HANDLE_VALUE)
+    if (handle_ == INVALID_HANDLE_VALUE) {
-    {
         return;
     }
     std::lock_guard<mutex_t> lock(mutex_);
@@ -63,76 +59,68 @@ SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &m
     auto size = static_cast<DWORD>(formatted.size());
     DWORD bytes_written = 0;
     bool ok = ::WriteFile(handle_, formatted.data(), size, &bytes_written, nullptr) != 0;
-    if (!ok)
+    if (!ok) {
-    {
+        throw_spdlog_ex("stdout_sink_base: WriteFile() failed. GetLastError(): " +
-        throw_spdlog_ex("stdout_sink_base: WriteFile() failed. GetLastError(): " + std::to_string(::GetLastError()));
+                        std::to_string(::GetLastError()));
     }
 #else
     std::lock_guard<mutex_t> lock(mutex_);
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
     ::fwrite(formatted.data(), sizeof(char), formatted.size(), file_);
-#endif               // WIN32
+#endif                // WIN32
-    ::fflush(file_); // flush every line to terminal
+    ::fflush(file_);  // flush every line to terminal
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::flush()
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::flush() {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     fflush(file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_pattern(const std::string &pattern)
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_formatter(
-{
+    std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::move(sink_formatter);
 }
 
 // stdout sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE stdout_sink<ConsoleMutex>::stdout_sink()
-    : stdout_sink_base<ConsoleMutex>(stdout)
+    : stdout_sink_base<ConsoleMutex>(stdout) {}
-{}
 
 // stderr sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE stderr_sink<ConsoleMutex>::stderr_sink()
-    : stdout_sink_base<ConsoleMutex>(stderr)
+    : stdout_sink_base<ConsoleMutex>(stderr) {}
-{}
 
-} // namespace sinks
+}  // namespace sinks
 
 // factory methods
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stdout_sink_mt>(logger_name);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stdout_sink_st>(logger_name);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stderr_sink_mt>(logger_name);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stderr_sink_st>(logger_name);
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/stdout_sinks.h

@@ -3,22 +3,21 @@
 
 #pragma once
 
+#include <cstdio>
 #include <spdlog/details/console_globals.h>
 #include <spdlog/details/synchronous_factory.h>
 #include <spdlog/sinks/sink.h>
-#include <cstdio>
 
 #ifdef _WIN32
-#    include <spdlog/details/windows_include.h>
+    #include <spdlog/details/windows_include.h>
 #endif
 
 namespace spdlog {
 
 namespace sinks {
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class stdout_sink_base : public sink
+class stdout_sink_base : public sink {
-{
 public:
     using mutex_t = typename ConsoleMutex::mutex_t;
     explicit stdout_sink_base(FILE *file);
@@ -42,19 +41,17 @@ protected:
     std::unique_ptr<spdlog::formatter> formatter_;
 #ifdef _WIN32
     HANDLE handle_;
-#endif // WIN32
+#endif  // WIN32
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class stdout_sink : public stdout_sink_base<ConsoleMutex>
+class stdout_sink : public stdout_sink_base<ConsoleMutex> {
-{
 public:
     stdout_sink();
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class stderr_sink : public stdout_sink_base<ConsoleMutex>
+class stderr_sink : public stdout_sink_base<ConsoleMutex> {
-{
 public:
     stderr_sink();
 };
@@ -65,23 +62,23 @@ using stdout_sink_st = stdout_sink<details::console_nullmutex>;
 using stderr_sink_mt = stderr_sink<details::console_mutex>;
 using stderr_sink_st = stderr_sink<details::console_nullmutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
 // factory methods
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name);
 
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "stdout_sinks-inl.h"
+    #include "stdout_sinks-inl.h"
 #endif

include/spdlog/sinks/syslog_sink.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <array>
 #include <string>
@@ -16,53 +16,42 @@ namespace sinks {
 /**
  * Sink that write to syslog using the `syscall()` library call.
  */
-template<typename Mutex>
+template <typename Mutex>
-class syslog_sink : public base_sink<Mutex>
+class syslog_sink : public base_sink<Mutex> {
-{
-
 public:
     syslog_sink(std::string ident, int syslog_option, int syslog_facility, bool enable_formatting)
-        : enable_formatting_{enable_formatting}
+        : enable_formatting_{enable_formatting},
-        , syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
+          syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
-              /* spdlog::level::debug      */ LOG_DEBUG,
+                          /* spdlog::level::debug      */ LOG_DEBUG,
-              /* spdlog::level::info       */ LOG_INFO,
+                          /* spdlog::level::info       */ LOG_INFO,
-              /* spdlog::level::warn       */ LOG_WARNING,
+                          /* spdlog::level::warn       */ LOG_WARNING,
-              /* spdlog::level::err        */ LOG_ERR,
+                          /* spdlog::level::err        */ LOG_ERR,
-              /* spdlog::level::critical   */ LOG_CRIT,
+                          /* spdlog::level::critical   */ LOG_CRIT,
-              /* spdlog::level::off        */ LOG_INFO}}
+                          /* spdlog::level::off        */ LOG_INFO}},
-        , ident_{std::move(ident)}
+          ident_{std::move(ident)} {
-    {
         // set ident to be program name if empty
         ::openlog(ident_.empty() ? nullptr : ident_.c_str(), syslog_option, syslog_facility);
     }
 
-    ~syslog_sink() override
+    ~syslog_sink() override { ::closelog(); }
-    {
-        ::closelog();
-    }
 
     syslog_sink(const syslog_sink &) = delete;
     syslog_sink &operator=(const syslog_sink &) = delete;
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         string_view_t payload;
         memory_buf_t formatted;
-        if (enable_formatting_)
+        if (enable_formatting_) {
-        {
             base_sink<Mutex>::formatter_->format(msg, formatted);
             payload = string_view_t(formatted.data(), formatted.size());
-        }
+        } else {
-        else
-        {
             payload = msg.payload;
         }
 
         size_t length = payload.size();
         // limit to max int
-        if (length > static_cast<size_t>(std::numeric_limits<int>::max()))
+        if (length > static_cast<size_t>(std::numeric_limits<int>::max())) {
-        {
             length = static_cast<size_t>(std::numeric_limits<int>::max());
         }
 
@@ -72,38 +61,43 @@ protected:
     void flush_() override {}
     bool enable_formatting_ = false;
 
+    //
+    // Simply maps spdlog's log level to syslog priority level.
+    //
+    int syslog_prio_from_level(const details::log_msg &msg) const {
+        return syslog_levels_.at(static_cast<levels_array::size_type>(msg.level));
+    }
+
 private:
     using levels_array = std::array<int, 7>;
     levels_array syslog_levels_;
     // must store the ident because the man says openlog might use the pointer as
     // is and not a string copy
     const std::string ident_;
-
-    //
-    // Simply maps spdlog's log level to syslog priority level.
-    //
-    int syslog_prio_from_level(const details::log_msg &msg) const
-    {
-        return syslog_levels_.at(static_cast<levels_array::size_type>(msg.level));
-    }
 };
 
 using syslog_sink_mt = syslog_sink<std::mutex>;
 using syslog_sink_st = syslog_sink<details::null_mutex>;
-} // namespace sinks
+}  // namespace sinks
 
 // Create and register a syslog logger
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> syslog_logger_mt(const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0,
+inline std::shared_ptr<logger> syslog_logger_mt(const std::string &logger_name,
-    int syslog_facility = LOG_USER, bool enable_formatting = false)
+                                                const std::string &syslog_ident = "",
-{
+                                                int syslog_option = 0,
-    return Factory::template create<sinks::syslog_sink_mt>(logger_name, syslog_ident, syslog_option, syslog_facility, enable_formatting);
+                                                int syslog_facility = LOG_USER,
+                                                bool enable_formatting = false) {
+    return Factory::template create<sinks::syslog_sink_mt>(logger_name, syslog_ident, syslog_option,
+                                                           syslog_facility, enable_formatting);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> syslog_logger_st(const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0,
+inline std::shared_ptr<logger> syslog_logger_st(const std::string &logger_name,
-    int syslog_facility = LOG_USER, bool enable_formatting = false)
+                                                const std::string &syslog_ident = "",
-{
+                                                int syslog_option = 0,
-    return Factory::template create<sinks::syslog_sink_st>(logger_name, syslog_ident, syslog_option, syslog_facility, enable_formatting);
+                                                int syslog_facility = LOG_USER,
+                                                bool enable_formatting = false) {
+    return Factory::template create<sinks::syslog_sink_st>(logger_name, syslog_ident, syslog_option,
+                                                           syslog_facility, enable_formatting);
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/systemd_sink.h

@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <spdlog/sinks/base_sink.h>
-#include <spdlog/details/os.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/details/os.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <array>
 #ifndef SD_JOURNAL_SUPPRESS_LOCATION
-#    define SD_JOURNAL_SUPPRESS_LOCATION
+    #define SD_JOURNAL_SUPPRESS_LOCATION
 #endif
 #include <systemd/sd-journal.h>
 
@@ -20,21 +20,19 @@ namespace sinks {
 /**
  * Sink that write to systemd journal using the `sd_journal_send()` library call.
  */
-template<typename Mutex>
+template <typename Mutex>
-class systemd_sink : public base_sink<Mutex>
+class systemd_sink : public base_sink<Mutex> {
-{
 public:
     systemd_sink(std::string ident = "", bool enable_formatting = false)
-        : ident_{std::move(ident)}
+        : ident_{std::move(ident)},
-        , enable_formatting_{enable_formatting}
+          enable_formatting_{enable_formatting},
-        , syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
+          syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
-              /* spdlog::level::debug      */ LOG_DEBUG,
+                          /* spdlog::level::debug      */ LOG_DEBUG,
-              /* spdlog::level::info       */ LOG_INFO,
+                          /* spdlog::level::info       */ LOG_INFO,
-              /* spdlog::level::warn       */ LOG_WARNING,
+                          /* spdlog::level::warn       */ LOG_WARNING,
-              /* spdlog::level::err        */ LOG_ERR,
+                          /* spdlog::level::err        */ LOG_ERR,
-              /* spdlog::level::critical   */ LOG_CRIT,
+                          /* spdlog::level::critical   */ LOG_CRIT,
-              /* spdlog::level::off        */ LOG_INFO}}
+                          /* spdlog::level::off        */ LOG_INFO}} {}
-    {}
 
     ~systemd_sink() override {}
 
@@ -47,58 +45,55 @@ protected:
     using levels_array = std::array<int, 7>;
     levels_array syslog_levels_;
 
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         int err;
         string_view_t payload;
         memory_buf_t formatted;
-        if (enable_formatting_)
+        if (enable_formatting_) {
-        {
             base_sink<Mutex>::formatter_->format(msg, formatted);
             payload = string_view_t(formatted.data(), formatted.size());
-        }
+        } else {
-        else
-        {
             payload = msg.payload;
         }
 
         size_t length = payload.size();
         // limit to max int
-        if (length > static_cast<size_t>(std::numeric_limits<int>::max()))
+        if (length > static_cast<size_t>(std::numeric_limits<int>::max())) {
-        {
             length = static_cast<size_t>(std::numeric_limits<int>::max());
         }
 
         const string_view_t syslog_identifier = ident_.empty() ? msg.logger_name : ident_;
 
         // Do not send source location if not available
-        if (msg.source.empty())
+        if (msg.source.empty()) {
-        {
             // Note: function call inside '()' to avoid macro expansion
-            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(), "PRIORITY=%d", syslog_level(msg.level),
+            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(),
+                                    "PRIORITY=%d", syslog_level(msg.level),
 #ifndef SPDLOG_NO_THREAD_ID
-                "TID=%zu", details::os::thread_id(),
+                                    "TID=%zu", msg.thread_id,
 #endif
-                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(syslog_identifier.size()), syslog_identifier.data(), nullptr);
+                                    "SYSLOG_IDENTIFIER=%.*s",
-        }
+                                    static_cast<int>(syslog_identifier.size()),
-        else
+                                    syslog_identifier.data(), nullptr);
-        {
+        } else {
-            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(), "PRIORITY=%d", syslog_level(msg.level),
+            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(),
+                                    "PRIORITY=%d", syslog_level(msg.level),
 #ifndef SPDLOG_NO_THREAD_ID
-                "TID=%zu", details::os::thread_id(),
+                                    "TID=%zu", msg.thread_id,
 #endif
-                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(syslog_identifier.size()), syslog_identifier.data(), "CODE_FILE=%s",
+                                    "SYSLOG_IDENTIFIER=%.*s",
-                msg.source.filename, "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s", msg.source.funcname, nullptr);
+                                    static_cast<int>(syslog_identifier.size()),
+                                    syslog_identifier.data(), "CODE_FILE=%s", msg.source.filename,
+                                    "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s",
+                                    msg.source.funcname, nullptr);
         }
 
-        if (err)
+        if (err) {
-        {
             throw_spdlog_ex("Failed writing to systemd", errno);
         }
     }
 
-    int syslog_level(level::level_enum l)
+    int syslog_level(level::level_enum l) {
-    {
         return syslog_levels_.at(static_cast<levels_array::size_type>(l));
     }
 
@@ -107,20 +102,20 @@ protected:
 
 using systemd_sink_mt = systemd_sink<std::mutex>;
 using systemd_sink_st = systemd_sink<details::null_mutex>;
-} // namespace sinks
+}  // namespace sinks
 
 // Create and register a syslog logger
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> systemd_logger_mt(
+inline std::shared_ptr<logger> systemd_logger_mt(const std::string &logger_name,
-    const std::string &logger_name, const std::string &ident = "", bool enable_formatting = false)
+                                                 const std::string &ident = "",
-{
+                                                 bool enable_formatting = false) {
     return Factory::template create<sinks::systemd_sink_mt>(logger_name, ident, enable_formatting);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> systemd_logger_st(
+inline std::shared_ptr<logger> systemd_logger_st(const std::string &logger_name,
-    const std::string &logger_name, const std::string &ident = "", bool enable_formatting = false)
+                                                 const std::string &ident = "",
-{
+                                                 bool enable_formatting = false) {
     return Factory::template create<sinks::systemd_sink_st>(logger_name, ident, enable_formatting);
 }
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/tcp_sink.h

@@ -4,53 +4,49 @@
 #pragma once
 
 #include <spdlog/common.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/sinks/base_sink.h>
 #ifdef _WIN32
-#    include <spdlog/details/tcp_client-windows.h>
+    #include <spdlog/details/tcp_client-windows.h>
 #else
-#    include <spdlog/details/tcp_client.h>
+    #include <spdlog/details/tcp_client.h>
 #endif
 
-#include <mutex>
-#include <string>
 #include <chrono>
 #include <functional>
+#include <mutex>
+#include <string>
 
 #pragma once
 
 // Simple tcp client sink
 // Connects to remote address and send the formatted log.
 // Will attempt to reconnect if connection drops.
-// If more complicated behaviour is needed (i.e get responses), you can inherit it and override the sink_it_ method.
+// If more complicated behaviour is needed (i.e get responses), you can inherit it and override the
+// sink_it_ method.
 
 namespace spdlog {
 namespace sinks {
 
-struct tcp_sink_config
+struct tcp_sink_config {
-{
     std::string server_host;
     int server_port;
-    bool lazy_connect = false; // if true connect on first log call instead of on construction
+    bool lazy_connect = false;  // if true connect on first log call instead of on construction
 
     tcp_sink_config(std::string host, int port)
-        : server_host{std::move(host)}
+        : server_host{std::move(host)},
-        , server_port{port}
+          server_port{port} {}
-    {}
 };
 
-template<typename Mutex>
+template <typename Mutex>
-class tcp_sink : public spdlog::sinks::base_sink<Mutex>
+class tcp_sink : public spdlog::sinks::base_sink<Mutex> {
-{
 public:
     // connect to tcp host/port or throw if failed
     // host can be hostname or ip address
 
     explicit tcp_sink(tcp_sink_config sink_config)
-        : config_{std::move(sink_config)}
+        : config_{std::move(sink_config)} {
-    {
+        if (!config_.lazy_connect) {
-        if (!config_.lazy_connect)
-        {
             this->client_.connect(config_.server_host, config_.server_port);
         }
     }
@@ -58,12 +54,10 @@ public:
     ~tcp_sink() override = default;
 
 protected:
-    void sink_it_(const spdlog::details::log_msg &msg) override
+    void sink_it_(const spdlog::details::log_msg &msg) override {
-    {
         spdlog::memory_buf_t formatted;
         spdlog::sinks::base_sink<Mutex>::formatter_->format(msg, formatted);
-        if (!client_.is_connected())
+        if (!client_.is_connected()) {
-        {
             client_.connect(config_.server_host, config_.server_port);
         }
         client_.send(formatted.data(), formatted.size());
@@ -77,5 +71,5 @@ protected:
 using tcp_sink_mt = tcp_sink<std::mutex>;
 using tcp_sink_st = tcp_sink<spdlog::details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/udp_sink.h

@@ -4,18 +4,18 @@
 #pragma once
 
 #include <spdlog/common.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/sinks/base_sink.h>
 #ifdef _WIN32
-#    include <spdlog/details/udp_client-windows.h>
+    #include <spdlog/details/udp_client-windows.h>
 #else
-#    include <spdlog/details/udp_client.h>
+    #include <spdlog/details/udp_client.h>
 #endif
 
-#include <mutex>
-#include <string>
 #include <chrono>
 #include <functional>
+#include <mutex>
+#include <string>
 
 // Simple udp client sink
 // Sends formatted log via udp
@@ -23,31 +23,26 @@
 namespace spdlog {
 namespace sinks {
 
-struct udp_sink_config
+struct udp_sink_config {
-{
     std::string server_host;
     uint16_t server_port;
 
     udp_sink_config(std::string host, uint16_t port)
-        : server_host{std::move(host)}
+        : server_host{std::move(host)},
-        , server_port{port}
+          server_port{port} {}
-    {}
 };
 
-template<typename Mutex>
+template <typename Mutex>
-class udp_sink : public spdlog::sinks::base_sink<Mutex>
+class udp_sink : public spdlog::sinks::base_sink<Mutex> {
-{
 public:
     // host can be hostname or ip address
     explicit udp_sink(udp_sink_config sink_config)
-        : client_{sink_config.server_host, sink_config.server_port}
+        : client_{sink_config.server_host, sink_config.server_port} {}
-    {}
 
     ~udp_sink() override = default;
 
 protected:
-    void sink_it_(const spdlog::details::log_msg &msg) override
+    void sink_it_(const spdlog::details::log_msg &msg) override {
-    {
         spdlog::memory_buf_t formatted;
         spdlog::sinks::base_sink<Mutex>::formatter_->format(msg, formatted);
         client_.send(formatted.data(), formatted.size());
@@ -60,15 +55,15 @@ protected:
 using udp_sink_mt = udp_sink<std::mutex>;
 using udp_sink_st = udp_sink<spdlog::details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
 
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> udp_logger_mt(const std::string &logger_name, sinks::udp_sink_config skin_config)
+inline std::shared_ptr<logger> udp_logger_mt(const std::string &logger_name,
-{
+                                             sinks::udp_sink_config skin_config) {
     return Factory::template create<sinks::udp_sink_mt>(logger_name, skin_config);
 }
 
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/win_eventlog_sink.h

@@ -1,17 +1,20 @@
 // Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
-// Writing to Windows Event Log requires the registry entries below to be present, with the following modifications:
+// Writing to Windows Event Log requires the registry entries below to be present, with the
+// following modifications:
 // 1. <log_name>    should be replaced with your log name (e.g. your application name)
-// 2. <source_name> should be replaced with the specific source name and the key should be duplicated for
+// 2. <source_name> should be replaced with the specific source name and the key should be
+// duplicated for
 //                  each source used in the application
 //
-// Since typically modifications of this kind require elevation, it's better to do it as a part of setup procedure.
+// Since typically modifications of this kind require elevation, it's better to do it as a part of
-// The snippet below uses mscoree.dll as the message file as it exists on most of the Windows systems anyway and
+// setup procedure. The snippet below uses mscoree.dll as the message file as it exists on most of
-// happens to contain the needed resource.
+// the Windows systems anyway and happens to contain the needed resource.
 //
 // You can also specify a custom message file if needed.
-// Please refer to Event Log functions descriptions in MSDN for more details on custom message files.
+// Please refer to Event Log functions descriptions in MSDN for more details on custom message
+// files.
 
 /*---------------------------------------------------------------------------------------
 
@@ -47,8 +50,7 @@ namespace win_eventlog {
 
 namespace internal {
 
-struct local_alloc_t
+struct local_alloc_t {
-{
     HLOCAL hlocal_;
 
     SPDLOG_CONSTEXPR local_alloc_t() SPDLOG_NOEXCEPT : hlocal_(nullptr) {}
@@ -56,30 +58,27 @@ struct local_alloc_t
     local_alloc_t(local_alloc_t const &) = delete;
     local_alloc_t &operator=(local_alloc_t const &) = delete;
 
-    ~local_alloc_t() SPDLOG_NOEXCEPT
+    ~local_alloc_t() SPDLOG_NOEXCEPT {
-    {
+        if (hlocal_) {
-        if (hlocal_)
-        {
             LocalFree(hlocal_);
         }
     }
 };
 
 /** Windows error */
-struct win32_error : public spdlog_ex
+struct win32_error : public spdlog_ex {
-{
     /** Formats an error report line: "user-message: error-code (system message)" */
-    static std::string format(std::string const &user_message, DWORD error_code = GetLastError())
+    static std::string format(std::string const &user_message, DWORD error_code = GetLastError()) {
-    {
         std::string system_message;
 
         local_alloc_t format_message_result{};
         auto format_message_succeeded =
-            ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr,
+            ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
-                error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&format_message_result.hlocal_, 0, nullptr);
+                                 FORMAT_MESSAGE_IGNORE_INSERTS,
+                             nullptr, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                             (LPSTR)&format_message_result.hlocal_, 0, nullptr);
 
-        if (format_message_succeeded && format_message_result.hlocal_)
+        if (format_message_succeeded && format_message_result.hlocal_) {
-        {
             system_message = fmt_lib::format(" ({})", (LPSTR)format_message_result.hlocal_);
         }
 
@@ -87,23 +86,19 @@ struct win32_error : public spdlog_ex
     }
 
     explicit win32_error(std::string const &func_name, DWORD error = GetLastError())
-        : spdlog_ex(format(func_name, error))
+        : spdlog_ex(format(func_name, error)) {}
-    {}
 };
 
 /** Wrapper for security identifiers (SID) on Windows */
-struct sid_t
+struct sid_t {
-{
     std::vector<char> buffer_;
 
 public:
     sid_t() {}
 
     /** creates a wrapped SID copy */
-    static sid_t duplicate_sid(PSID psid)
+    static sid_t duplicate_sid(PSID psid) {
-    {
+        if (!::IsValidSid(psid)) {
-        if (!::IsValidSid(psid))
-        {
             throw_spdlog_ex("sid_t::sid_t(): invalid SID received");
         }
 
@@ -111,8 +106,7 @@ public:
 
         sid_t result;
         result.buffer_.resize(sid_length);
-        if (!::CopySid(sid_length, (PSID)result.as_sid(), psid))
+        if (!::CopySid(sid_length, (PSID)result.as_sid(), psid)) {
-        {
             SPDLOG_THROW(win32_error("CopySid"));
         }
 
@@ -120,44 +114,36 @@ public:
     }
 
     /** Retrieves pointer to the internal buffer contents as SID* */
-    SID *as_sid() const
+    SID *as_sid() const { return buffer_.empty() ? nullptr : (SID *)buffer_.data(); }
-    {
-        return buffer_.empty() ? nullptr : (SID *)buffer_.data();
-    }
 
     /** Get SID for the current user */
-    static sid_t get_current_user_sid()
+    static sid_t get_current_user_sid() {
-    {
         /* create and init RAII holder for process token */
-        struct process_token_t
+        struct process_token_t {
-        {
             HANDLE token_handle_ = INVALID_HANDLE_VALUE;
-            explicit process_token_t(HANDLE process)
+            explicit process_token_t(HANDLE process) {
-            {
+                if (!::OpenProcessToken(process, TOKEN_QUERY, &token_handle_)) {
-                if (!::OpenProcessToken(process, TOKEN_QUERY, &token_handle_))
-                {
                     SPDLOG_THROW(win32_error("OpenProcessToken"));
                 }
             }
 
-            ~process_token_t()
+            ~process_token_t() { ::CloseHandle(token_handle_); }
-            {
-                ::CloseHandle(token_handle_);
-            }
 
-        } current_process_token(::GetCurrentProcess()); // GetCurrentProcess returns pseudohandle, no leak here!
+        } current_process_token(
+            ::GetCurrentProcess());  // GetCurrentProcess returns pseudohandle, no leak here!
 
-        // Get the required size, this is expected to fail with ERROR_INSUFFICIENT_BUFFER and return the token size
+        // Get the required size, this is expected to fail with ERROR_INSUFFICIENT_BUFFER and return
+        // the token size
         DWORD tusize = 0;
-        if (::GetTokenInformation(current_process_token.token_handle_, TokenUser, NULL, 0, &tusize))
+        if (::GetTokenInformation(current_process_token.token_handle_, TokenUser, NULL, 0,
-        {
+                                  &tusize)) {
             SPDLOG_THROW(win32_error("GetTokenInformation should fail"));
         }
 
         // get user token
         std::vector<unsigned char> buffer(static_cast<size_t>(tusize));
-        if (!::GetTokenInformation(current_process_token.token_handle_, TokenUser, (LPVOID)buffer.data(), tusize, &tusize))
+        if (!::GetTokenInformation(current_process_token.token_handle_, TokenUser,
-        {
+                                   (LPVOID)buffer.data(), tusize, &tusize)) {
             SPDLOG_THROW(win32_error("GetTokenInformation"));
         }
 
@@ -166,59 +152,49 @@ public:
     }
 };
 
-struct eventlog
+struct eventlog {
-{
+    static WORD get_event_type(details::log_msg const &msg) {
-    static WORD get_event_type(details::log_msg const &msg)
+        switch (msg.level) {
-    {
+            case level::trace:
-        switch (msg.level)
+            case level::debug:
-        {
+                return EVENTLOG_SUCCESS;
-        case level::trace:
-        case level::debug:
-            return EVENTLOG_SUCCESS;
 
-        case level::info:
+            case level::info:
-            return EVENTLOG_INFORMATION_TYPE;
+                return EVENTLOG_INFORMATION_TYPE;
 
-        case level::warn:
+            case level::warn:
-            return EVENTLOG_WARNING_TYPE;
+                return EVENTLOG_WARNING_TYPE;
 
-        case level::err:
+            case level::err:
-        case level::critical:
+            case level::critical:
-        case level::off:
+            case level::off:
-            return EVENTLOG_ERROR_TYPE;
+                return EVENTLOG_ERROR_TYPE;
 
-        default:
+            default:
-            return EVENTLOG_INFORMATION_TYPE;
+                return EVENTLOG_INFORMATION_TYPE;
         }
     }
 
-    static WORD get_event_category(details::log_msg const &msg)
+    static WORD get_event_category(details::log_msg const &msg) { return (WORD)msg.level; }
-    {
-        return (WORD)msg.level;
-    }
 };
 
-} // namespace internal
+}  // namespace internal
 
 /*
  * Windows Event Log sink
  */
-template<typename Mutex>
+template <typename Mutex>
-class win_eventlog_sink : public base_sink<Mutex>
+class win_eventlog_sink : public base_sink<Mutex> {
-{
 private:
     HANDLE hEventLog_{NULL};
     internal::sid_t current_user_sid_;
     std::string source_;
     DWORD event_id_;
 
-    HANDLE event_log_handle()
+    HANDLE event_log_handle() {
-    {
+        if (!hEventLog_) {
-        if (!hEventLog_)
-        {
             hEventLog_ = ::RegisterEventSourceA(nullptr, source_.c_str());
-            if (!hEventLog_ || hEventLog_ == (HANDLE)ERROR_ACCESS_DENIED)
+            if (!hEventLog_ || hEventLog_ == (HANDLE)ERROR_ACCESS_DENIED) {
-            {
                 SPDLOG_THROW(internal::win32_error("RegisterEventSource"));
             }
         }
@@ -227,8 +203,7 @@ private:
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         using namespace internal;
 
         bool succeeded;
@@ -241,16 +216,17 @@ protected:
         details::os::utf8_to_wstrbuf(string_view_t(formatted.data(), formatted.size()), buf);
 
         LPCWSTR lp_wstr = buf.data();
-        succeeded = static_cast<bool>(::ReportEventW(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg),
+        succeeded = static_cast<bool>(::ReportEventW(
+            event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg),
             event_id_, current_user_sid_.as_sid(), 1, 0, &lp_wstr, nullptr));
 #else
         LPCSTR lp_str = formatted.data();
-        succeeded = static_cast<bool>(::ReportEventA(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg),
+        succeeded = static_cast<bool>(::ReportEventA(
+            event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg),
             event_id_, current_user_sid_.as_sid(), 1, 0, &lp_str, nullptr));
 #endif
 
-        if (!succeeded)
+        if (!succeeded) {
-        {
             SPDLOG_THROW(win32_error("ReportEvent"));
         }
     }
@@ -258,32 +234,27 @@ protected:
     void flush_() override {}
 
 public:
-    win_eventlog_sink(std::string const &source, DWORD event_id = 1000 /* according to mscoree.dll */)
+    win_eventlog_sink(std::string const &source,
-        : source_(source)
+                      DWORD event_id = 1000 /* according to mscoree.dll */)
-        , event_id_(event_id)
+        : source_(source),
-    {
+          event_id_(event_id) {
-        try
+        try {
-        {
             current_user_sid_ = internal::sid_t::get_current_user_sid();
-        }
+        } catch (...) {
-        catch (...)
+            // get_current_user_sid() is unlikely to fail and if it does, we can still proceed
-        {
+            // without current_user_sid but in the event log the record will have no user name
-            // get_current_user_sid() is unlikely to fail and if it does, we can still proceed without
-            // current_user_sid but in the event log the record will have no user name
         }
     }
 
-    ~win_eventlog_sink()
+    ~win_eventlog_sink() {
-    {
+        if (hEventLog_) DeregisterEventSource(hEventLog_);
-        if (hEventLog_)
-            DeregisterEventSource(hEventLog_);
     }
 };
 
-} // namespace win_eventlog
+}  // namespace win_eventlog
 
 using win_eventlog_sink_mt = win_eventlog::win_eventlog_sink<std::mutex>;
 using win_eventlog_sink_st = win_eventlog::win_eventlog_sink<details::null_mutex>;
 
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog

include/spdlog/sinks/wincolor_sink-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/wincolor_sink.h>
+    #include <spdlog/sinks/wincolor_sink.h>
 #endif
 
 #include <spdlog/details/windows_include.h>
@@ -15,44 +15,41 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE wincolor_sink<ConsoleMutex>::wincolor_sink(void *out_handle, color_mode mode)
-    : out_handle_(out_handle)
+    : out_handle_(out_handle),
-    , mutex_(ConsoleMutex::mutex())
+      mutex_(ConsoleMutex::mutex()),
-    , formatter_(details::make_unique<spdlog::pattern_formatter>())
+      formatter_(details::make_unique<spdlog::pattern_formatter>()) {
-{
-
     set_color_mode_impl(mode);
     // set level colors
-    colors_[level::trace] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;     // white
+    colors_[level::trace] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;  // white
-    colors_[level::debug] = FOREGROUND_GREEN | FOREGROUND_BLUE;                      // cyan
+    colors_[level::debug] = FOREGROUND_GREEN | FOREGROUND_BLUE;                   // cyan
-    colors_[level::info] = FOREGROUND_GREEN;                                         // green
+    colors_[level::info] = FOREGROUND_GREEN;                                      // green
-    colors_[level::warn] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY; // intense yellow
+    colors_[level::warn] =
-    colors_[level::err] = FOREGROUND_RED | FOREGROUND_INTENSITY;                     // intense red
+        FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY;  // intense yellow
-    colors_[level::critical] =
+    colors_[level::err] = FOREGROUND_RED | FOREGROUND_INTENSITY;   // intense red
-        BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY; // intense white on red background
+    colors_[level::critical] = BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN |
+                               FOREGROUND_BLUE |
+                               FOREGROUND_INTENSITY;  // intense white on red background
     colors_[level::off] = 0;
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE wincolor_sink<ConsoleMutex>::~wincolor_sink()
+SPDLOG_INLINE wincolor_sink<ConsoleMutex>::~wincolor_sink() {
-{
     this->flush();
 }
 
 // change the color for the given level
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color(level::level_enum level, std::uint16_t color)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color(level::level_enum level,
-{
+                                                          std::uint16_t color) {
     std::lock_guard<mutex_t> lock(mutex_);
     colors_[static_cast<size_t>(level)] = color;
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::log(const details::log_msg &msg)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::log(const details::log_msg &msg) {
-{
+    if (out_handle_ == nullptr || out_handle_ == INVALID_HANDLE_VALUE) {
-    if (out_handle_ == nullptr || out_handle_ == INVALID_HANDLE_VALUE)
-    {
         return;
     }
 
@@ -61,115 +58,106 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::log(const details::log_msg &msg)
     msg.color_range_end = 0;
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    if (should_do_colors_ && msg.color_range_end > msg.color_range_start)
+    if (should_do_colors_ && msg.color_range_end > msg.color_range_start) {
-    {
         // before color range
         print_range_(formatted, 0, msg.color_range_start);
         // in color range
-        auto orig_attribs = static_cast<WORD>(set_foreground_color_(colors_[static_cast<size_t>(msg.level)]));
+        auto orig_attribs =
+            static_cast<WORD>(set_foreground_color_(colors_[static_cast<size_t>(msg.level)]));
         print_range_(formatted, msg.color_range_start, msg.color_range_end);
         // reset to orig colors
         ::SetConsoleTextAttribute(static_cast<HANDLE>(out_handle_), orig_attribs);
         print_range_(formatted, msg.color_range_end, formatted.size());
-    }
+    } else  // print without colors if color range is invalid (or color is disabled)
-    else // print without colors if color range is invalid (or color is disabled)
     {
         write_to_file_(formatted);
     }
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::flush()
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::flush() {
-{
     // windows console always flushed?
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+void SPDLOG_INLINE
-{
+wincolor_sink<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::move(sink_formatter);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode(color_mode mode)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode(color_mode mode) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     set_color_mode_impl(mode);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode_impl(color_mode mode)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode_impl(color_mode mode) {
-{
+    if (mode == color_mode::automatic) {
-    if (mode == color_mode::automatic)
-    {
         // should do colors only if out_handle_  points to actual console.
         DWORD console_mode;
         bool in_console = ::GetConsoleMode(static_cast<HANDLE>(out_handle_), &console_mode) != 0;
         should_do_colors_ = in_console;
-    }
+    } else {
-    else
-    {
         should_do_colors_ = mode == color_mode::always ? true : false;
     }
 }
 
 // set foreground color and return the orig console attributes (for resetting later)
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-std::uint16_t SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_foreground_color_(std::uint16_t attribs)
+std::uint16_t SPDLOG_INLINE
-{
+wincolor_sink<ConsoleMutex>::set_foreground_color_(std::uint16_t attribs) {
     CONSOLE_SCREEN_BUFFER_INFO orig_buffer_info;
-    if (!::GetConsoleScreenBufferInfo(static_cast<HANDLE>(out_handle_), &orig_buffer_info))
+    if (!::GetConsoleScreenBufferInfo(static_cast<HANDLE>(out_handle_), &orig_buffer_info)) {
-    {
         // just return white if failed getting console info
         return FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
     }
 
     // change only the foreground bits (lowest 4 bits)
     auto new_attribs = static_cast<WORD>(attribs) | (orig_buffer_info.wAttributes & 0xfff0);
-    auto ignored = ::SetConsoleTextAttribute(static_cast<HANDLE>(out_handle_), static_cast<WORD>(new_attribs));
+    auto ignored =
+        ::SetConsoleTextAttribute(static_cast<HANDLE>(out_handle_), static_cast<WORD>(new_attribs));
     (void)(ignored);
-    return static_cast<std::uint16_t>(orig_buffer_info.wAttributes); // return orig attribs
+    return static_cast<std::uint16_t>(orig_buffer_info.wAttributes);  // return orig attribs
 }
 
 // print a range of formatted message to console
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted, size_t start, size_t end)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted,
-{
+                                                             size_t start,
-    if (end > start)
+                                                             size_t end) {
-    {
+    if (end > start) {
         auto size = static_cast<DWORD>(end - start);
-        auto ignored = ::WriteConsoleA(static_cast<HANDLE>(out_handle_), formatted.data() + start, size, nullptr, nullptr);
+        auto ignored = ::WriteConsoleA(static_cast<HANDLE>(out_handle_), formatted.data() + start,
+                                       size, nullptr, nullptr);
         (void)(ignored);
     }
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const memory_buf_t &formatted)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const memory_buf_t &formatted) {
-{
     auto size = static_cast<DWORD>(formatted.size());
     DWORD bytes_written = 0;
-    auto ignored = ::WriteFile(static_cast<HANDLE>(out_handle_), formatted.data(), size, &bytes_written, nullptr);
+    auto ignored = ::WriteFile(static_cast<HANDLE>(out_handle_), formatted.data(), size,
+                               &bytes_written, nullptr);
     (void)(ignored);
 }
 
 // wincolor_stdout_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE wincolor_stdout_sink<ConsoleMutex>::wincolor_stdout_sink(color_mode mode)
-    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_OUTPUT_HANDLE), mode)
+    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_OUTPUT_HANDLE), mode) {}
-{}
 
 // wincolor_stderr_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE wincolor_stderr_sink<ConsoleMutex>::wincolor_stderr_sink(color_mode mode)
-    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_ERROR_HANDLE), mode)
+    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_ERROR_HANDLE), mode) {}
-{}
+}  // namespace sinks
-} // namespace sinks
+}  // namespace spdlog
-} // namespace spdlog

include/spdlog/sinks/wincolor_sink.h

@@ -8,11 +8,11 @@
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/sinks/sink.h>
 
+#include <array>
+#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <string>
-#include <array>
-#include <cstdint>
 
 namespace spdlog {
 namespace sinks {
@@ -20,9 +20,8 @@ namespace sinks {
  * Windows color console sink. Uses WriteConsoleA to write to the console with
  * colors
  */
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class wincolor_sink : public sink
+class wincolor_sink : public sink {
-{
 public:
     wincolor_sink(void *out_handle, color_mode mode);
     ~wincolor_sink() override;
@@ -58,16 +57,14 @@ protected:
     void set_color_mode_impl(color_mode mode);
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class wincolor_stdout_sink : public wincolor_sink<ConsoleMutex>
+class wincolor_stdout_sink : public wincolor_sink<ConsoleMutex> {
-{
 public:
     explicit wincolor_stdout_sink(color_mode mode = color_mode::automatic);
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class wincolor_stderr_sink : public wincolor_sink<ConsoleMutex>
+class wincolor_stderr_sink : public wincolor_sink<ConsoleMutex> {
-{
 public:
     explicit wincolor_stderr_sink(color_mode mode = color_mode::automatic);
 };
@@ -77,9 +74,9 @@ using wincolor_stdout_sink_st = wincolor_stdout_sink<details::console_nullmutex>
 
 using wincolor_stderr_sink_mt = wincolor_stderr_sink<details::console_mutex>;
 using wincolor_stderr_sink_st = wincolor_stderr_sink<details::console_nullmutex>;
-} // namespace sinks
+}  // namespace sinks
-} // namespace spdlog
+}  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "wincolor_sink-inl.h"
+    #include "wincolor_sink-inl.h"
 #endif

include/spdlog/spdlog-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/spdlog.h>
+    #include <spdlog/spdlog.h>
 #endif
 
 #include <spdlog/common.h>
@@ -12,114 +12,81 @@
 
 namespace spdlog {
 
-SPDLOG_INLINE void initialize_logger(std::shared_ptr<logger> logger)
+SPDLOG_INLINE void initialize_logger(std::shared_ptr<logger> logger) {
-{
     details::registry::instance().initialize_logger(std::move(logger));
 }
 
-SPDLOG_INLINE std::shared_ptr<logger> get(const std::string &name)
+SPDLOG_INLINE std::shared_ptr<logger> get(const std::string &name) {
-{
     return details::registry::instance().get(name);
 }
 
-SPDLOG_INLINE void set_formatter(std::unique_ptr<spdlog::formatter> formatter)
+SPDLOG_INLINE void set_formatter(std::unique_ptr<spdlog::formatter> formatter) {
-{
     details::registry::instance().set_formatter(std::move(formatter));
 }
 
-SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type)
+SPDLOG_INLINE void set_pattern(std::string pattern, pattern_time_type time_type) {
-{
+    set_formatter(
-    set_formatter(std::unique_ptr<spdlog::formatter>(new pattern_formatter(std::move(pattern), time_type)));
+        std::unique_ptr<spdlog::formatter>(new pattern_formatter(std::move(pattern), time_type)));
 }
 
-SPDLOG_INLINE void enable_backtrace(size_t n_messages)
+SPDLOG_INLINE void enable_backtrace(size_t n_messages) {
-{
     details::registry::instance().enable_backtrace(n_messages);
 }
 
-SPDLOG_INLINE void disable_backtrace()
+SPDLOG_INLINE void disable_backtrace() { details::registry::instance().disable_backtrace(); }
-{
-    details::registry::instance().disable_backtrace();
-}
 
-SPDLOG_INLINE void dump_backtrace()
+SPDLOG_INLINE void dump_backtrace() { default_logger_raw()->dump_backtrace(); }
-{
-    default_logger_raw()->dump_backtrace();
-}
 
-SPDLOG_INLINE level::level_enum get_level()
+SPDLOG_INLINE level::level_enum get_level() { return default_logger_raw()->level(); }
-{
-    return default_logger_raw()->level();
-}
 
-SPDLOG_INLINE bool should_log(level::level_enum log_level)
+SPDLOG_INLINE bool should_log(level::level_enum log_level) {
-{
     return default_logger_raw()->should_log(log_level);
 }
 
-SPDLOG_INLINE void set_level(level::level_enum log_level)
+SPDLOG_INLINE void set_level(level::level_enum log_level) {
-{
     details::registry::instance().set_level(log_level);
 }
 
-SPDLOG_INLINE void flush_on(level::level_enum log_level)
+SPDLOG_INLINE void flush_on(level::level_enum log_level) {
-{
     details::registry::instance().flush_on(log_level);
 }
 
-SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg))
+SPDLOG_INLINE void set_error_handler(void (*handler)(const std::string &msg)) {
-{
     details::registry::instance().set_error_handler(handler);
 }
 
-SPDLOG_INLINE void register_logger(std::shared_ptr<logger> logger)
+SPDLOG_INLINE void register_logger(std::shared_ptr<logger> logger) {
-{
     details::registry::instance().register_logger(std::move(logger));
 }
 
-SPDLOG_INLINE void apply_all(const std::function<void(std::shared_ptr<logger>)> &fun)
+SPDLOG_INLINE void apply_all(const std::function<void(std::shared_ptr<logger>)> &fun) {
-{
     details::registry::instance().apply_all(fun);
 }
 
-SPDLOG_INLINE void drop(const std::string &name)
+SPDLOG_INLINE void drop(const std::string &name) { details::registry::instance().drop(name); }
-{
-    details::registry::instance().drop(name);
-}
 
-SPDLOG_INLINE void drop_all()
+SPDLOG_INLINE void drop_all() { details::registry::instance().drop_all(); }
-{
-    details::registry::instance().drop_all();
-}
 
-SPDLOG_INLINE void shutdown()
+SPDLOG_INLINE void shutdown() { details::registry::instance().shutdown(); }
-{
-    details::registry::instance().shutdown();
-}
 
-SPDLOG_INLINE void set_automatic_registration(bool automatic_registration)
+SPDLOG_INLINE void set_automatic_registration(bool automatic_registration) {
-{
     details::registry::instance().set_automatic_registration(automatic_registration);
 }
 
-SPDLOG_INLINE std::shared_ptr<spdlog::logger> default_logger()
+SPDLOG_INLINE std::shared_ptr<spdlog::logger> default_logger() {
-{
     return details::registry::instance().default_logger();
 }
 
-SPDLOG_INLINE spdlog::logger *default_logger_raw()
+SPDLOG_INLINE spdlog::logger *default_logger_raw() {
-{
     return details::registry::instance().get_default_raw();
 }
 
-SPDLOG_INLINE void set_default_logger(std::shared_ptr<spdlog::logger> default_logger)
+SPDLOG_INLINE void set_default_logger(std::shared_ptr<spdlog::logger> default_logger) {
-{
     details::registry::instance().set_default_logger(std::move(default_logger));
 }
 
-SPDLOG_INLINE void apply_logger_env_levels(std::shared_ptr<logger> logger)
+SPDLOG_INLINE void apply_logger_env_levels(std::shared_ptr<logger> logger) {
-{
     details::registry::instance().apply_logger_env_levels(std::move(logger));
 }
 
-} // namespace spdlog
+}  // namespace spdlog