Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gabime/spdlog.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgabime <gmelman1@mgail.com>2021-07-19 00:50:51 +0300
committergabime <gmelman1@mgail.com>2021-07-19 00:50:51 +0300
commite7e8b75a4cf054770226e13d802a9f3d2706a1ae (patch)
treee9c019e0fbef986fcb03650c8f7594c6cf875df9 /include/spdlog
parente98265a49bf68ff059580362f87bbd0d6e395cea (diff)
clang-format
Diffstat (limited to 'include/spdlog')
-rw-r--r--include/spdlog/async_logger-inl.h2
-rw-r--r--include/spdlog/async_logger.h2
-rw-r--r--include/spdlog/cfg/helpers-inl.h2
-rw-r--r--include/spdlog/cfg/helpers.h2
-rw-r--r--include/spdlog/common-inl.h4
-rw-r--r--include/spdlog/details/backtracer-inl.h2
-rw-r--r--include/spdlog/details/backtracer.h3
-rw-r--r--include/spdlog/details/file_helper-inl.h2
-rw-r--r--include/spdlog/details/file_helper.h2
-rw-r--r--include/spdlog/details/log_msg-inl.h2
-rw-r--r--include/spdlog/details/log_msg.h2
-rw-r--r--include/spdlog/details/log_msg_buffer-inl.h6
-rw-r--r--include/spdlog/details/log_msg_buffer.h2
-rw-r--r--include/spdlog/details/os-inl.h130
-rw-r--r--include/spdlog/details/os.h22
-rw-r--r--include/spdlog/details/periodic_worker-inl.h2
-rw-r--r--include/spdlog/details/periodic_worker.h2
-rw-r--r--include/spdlog/details/registry-inl.h18
-rw-r--r--include/spdlog/details/registry.h2
-rw-r--r--include/spdlog/details/synchronous_factory.h1
-rw-r--r--include/spdlog/details/tcp_client.h4
-rw-r--r--include/spdlog/details/thread_pool-inl.h2
-rw-r--r--include/spdlog/details/thread_pool.h2
-rw-r--r--include/spdlog/details/windows_include.h4
-rw-r--r--include/spdlog/fmt/chrono.h14
-rw-r--r--include/spdlog/fmt/compile.h14
-rw-r--r--include/spdlog/fmt/fmt.h23
-rw-r--r--include/spdlog/fmt/ostr.h14
-rw-r--r--include/spdlog/fmt/xchar.h14
-rw-r--r--include/spdlog/logger-inl.h2
-rw-r--r--include/spdlog/pattern_formatter-inl.h14
-rw-r--r--include/spdlog/pattern_formatter.h4
-rw-r--r--include/spdlog/sinks/android_sink.h30
-rw-r--r--include/spdlog/sinks/ansicolor_sink-inl.h2
-rw-r--r--include/spdlog/sinks/ansicolor_sink.h2
-rw-r--r--include/spdlog/sinks/base_sink-inl.h2
-rw-r--r--include/spdlog/sinks/base_sink.h2
-rw-r--r--include/spdlog/sinks/basic_file_sink-inl.h2
-rw-r--r--include/spdlog/sinks/basic_file_sink.h3
-rw-r--r--include/spdlog/sinks/hourly_file_sink.h4
-rw-r--r--include/spdlog/sinks/mongo_sink.h98
-rw-r--r--include/spdlog/sinks/msvc_sink.h9
-rw-r--r--include/spdlog/sinks/qt_sinks.h387
-rw-r--r--include/spdlog/sinks/rotating_file_sink-inl.h2
-rw-r--r--include/spdlog/sinks/rotating_file_sink.h2
-rw-r--r--include/spdlog/sinks/sink-inl.h2
-rw-r--r--include/spdlog/sinks/sink.h2
-rw-r--r--include/spdlog/sinks/stdout_color_sinks-inl.h3
-rw-r--r--include/spdlog/sinks/stdout_color_sinks.h6
-rw-r--r--include/spdlog/sinks/stdout_sinks-inl.h26
-rw-r--r--include/spdlog/sinks/stdout_sinks.h6
-rw-r--r--include/spdlog/sinks/systemd_sink.h2
-rw-r--r--include/spdlog/sinks/tcp_sink.h4
-rw-r--r--include/spdlog/sinks/win_eventlog_sink.h4
-rw-r--r--include/spdlog/sinks/wincolor_sink-inl.h8
-rw-r--r--include/spdlog/sinks/wincolor_sink.h6
-rw-r--r--include/spdlog/spdlog-inl.h2
-rw-r--r--include/spdlog/spdlog.h66
58 files changed, 505 insertions, 498 deletions
diff --git a/include/spdlog/async_logger-inl.h b/include/spdlog/async_logger-inl.h
index f8c9694c..6fac8fc9 100644
--- a/include/spdlog/async_logger-inl.h
+++ b/include/spdlog/async_logger-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/async_logger.h>
+# include <spdlog/async_logger.h>
#endif
#include <spdlog/sinks/sink.h>
diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h
index 6f299672..91a93fcb 100644
--- a/include/spdlog/async_logger.h
+++ b/include/spdlog/async_logger.h
@@ -64,5 +64,5 @@ private:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "async_logger-inl.h"
+# include "async_logger-inl.h"
#endif
diff --git a/include/spdlog/cfg/helpers-inl.h b/include/spdlog/cfg/helpers-inl.h
index 9e4daede..675a13af 100644
--- a/include/spdlog/cfg/helpers-inl.h
+++ b/include/spdlog/cfg/helpers-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/cfg/helpers.h>
+# include <spdlog/cfg/helpers.h>
#endif
#include <spdlog/spdlog.h>
diff --git a/include/spdlog/cfg/helpers.h b/include/spdlog/cfg/helpers.h
index a795f39a..ab7584e0 100644
--- a/include/spdlog/cfg/helpers.h
+++ b/include/spdlog/cfg/helpers.h
@@ -25,5 +25,5 @@ SPDLOG_API void load_levels(const std::string &txt);
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "helpers-inl.h"
+# include "helpers-inl.h"
#endif // SPDLOG_HEADER_ONLY
diff --git a/include/spdlog/common-inl.h b/include/spdlog/common-inl.h
index 5fa4e5d9..f8347656 100644
--- a/include/spdlog/common-inl.h
+++ b/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>
@@ -16,7 +16,7 @@ namespace level {
#if __cplusplus >= 201703L
constexpr
#endif
-static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES;
+ static string_view_t level_string_views[] SPDLOG_LEVEL_NAMES;
static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES;
diff --git a/include/spdlog/details/backtracer-inl.h b/include/spdlog/details/backtracer-inl.h
index 21553c26..2621c8f7 100644
--- a/include/spdlog/details/backtracer-inl.h
+++ b/include/spdlog/details/backtracer-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/details/backtracer.h>
+# include <spdlog/details/backtracer.h>
#endif
namespace spdlog {
namespace details {
diff --git a/include/spdlog/details/backtracer.h b/include/spdlog/details/backtracer.h
index 81736580..b336ee77 100644
--- a/include/spdlog/details/backtracer.h
+++ b/include/spdlog/details/backtracer.h
@@ -41,6 +41,5 @@ public:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "backtracer-inl.h"
+# include "backtracer-inl.h"
#endif
-
diff --git a/include/spdlog/details/file_helper-inl.h b/include/spdlog/details/file_helper-inl.h
index 30f3cf55..ac7021a9 100644
--- a/include/spdlog/details/file_helper-inl.h
+++ b/include/spdlog/details/file_helper-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/details/file_helper.h>
+# include <spdlog/details/file_helper.h>
#endif
#include <spdlog/details/os.h>
diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h
index 473baf1e..cfccaed2 100644
--- a/include/spdlog/details/file_helper.h
+++ b/include/spdlog/details/file_helper.h
@@ -55,5 +55,5 @@ private:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "file_helper-inl.h"
+# include "file_helper-inl.h"
#endif
diff --git a/include/spdlog/details/log_msg-inl.h b/include/spdlog/details/log_msg-inl.h
index af11e0da..c6e8a7e0 100644
--- a/include/spdlog/details/log_msg-inl.h
+++ b/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>
diff --git a/include/spdlog/details/log_msg.h b/include/spdlog/details/log_msg.h
index b9d4ffc3..fed51abd 100644
--- a/include/spdlog/details/log_msg.h
+++ b/include/spdlog/details/log_msg.h
@@ -33,5 +33,5 @@ struct SPDLOG_API log_msg
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "log_msg-inl.h"
+# include "log_msg-inl.h"
#endif
diff --git a/include/spdlog/details/log_msg_buffer-inl.h b/include/spdlog/details/log_msg_buffer-inl.h
index ca9429bb..84d83dc2 100644
--- a/include/spdlog/details/log_msg_buffer-inl.h
+++ b/include/spdlog/details/log_msg_buffer-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/details/log_msg_buffer.h>
+# include <spdlog/details/log_msg_buffer.h>
#endif
namespace spdlog {
@@ -26,9 +26,7 @@ SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
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();
}
diff --git a/include/spdlog/details/log_msg_buffer.h b/include/spdlog/details/log_msg_buffer.h
index 4410110f..81055065 100644
--- a/include/spdlog/details/log_msg_buffer.h
+++ b/include/spdlog/details/log_msg_buffer.h
@@ -29,5 +29,5 @@ public:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "log_msg_buffer-inl.h"
+# include "log_msg_buffer-inl.h"
#endif
diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h
index 9efddf21..4602782c 100644
--- a/include/spdlog/details/os-inl.h
+++ b/include/spdlog/details/os-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/details/os.h>
+# include <spdlog/details/os.h>
#endif
#include <spdlog/common.h>
@@ -23,45 +23,45 @@
#ifdef _WIN32
-#include <io.h> // _get_osfhandle and _isatty support
-#include <process.h> // _get_pid support
-#include <spdlog/details/windows_include.h>
+# include <io.h> // _get_osfhandle and _isatty support
+# include <process.h> // _get_pid support
+# include <spdlog/details/windows_include.h>
-#ifdef __MINGW32__
-#include <share.h>
-#endif
+# ifdef __MINGW32__
+# include <share.h>
+# endif
-#if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
-#include <limits>
-#endif
+# if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
+# include <limits>
+# endif
-#include <direct.h> // for _mkdir/_wmkdir
+# include <direct.h> // for _mkdir/_wmkdir
#else // unix
-#include <fcntl.h>
-#include <unistd.h>
+# include <fcntl.h>
+# include <unistd.h>
-#ifdef __linux__
-#include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
+# ifdef __linux__
+# include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
-#elif defined(_AIX)
-#include <pthread.h> // for pthread_getthreadid_np
+# elif defined(_AIX)
+# include <pthread.h> // for pthread_getthreadid_np
-#elif defined(__DragonFly__) || defined(__FreeBSD__)
-#include <pthread_np.h> // for pthread_getthreadid_np
+# elif defined(__DragonFly__) || defined(__FreeBSD__)
+# include <pthread_np.h> // for pthread_getthreadid_np
-#elif defined(__NetBSD__)
-#include <lwp.h> // for _lwp_self
+# elif defined(__NetBSD__)
+# include <lwp.h> // for _lwp_self
-#elif defined(__sun)
-#include <thread.h> // for thr_self
-#endif
+# elif defined(__sun)
+# include <thread.h> // for thr_self
+# endif
#endif // unix
-#ifndef __has_feature // Clang - feature checking macros.
-#define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#ifndef __has_feature // Clang - feature checking macros.
+# define __has_feature(x) 0 // Compatibility with non-clang compilers.
#endif
namespace spdlog {
@@ -123,12 +123,12 @@ SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT
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
-#if defined(SPDLOG_PREVENT_CHILD_FD)
+# endif
+# if defined(SPDLOG_PREVENT_CHILD_FD)
if (*fp != nullptr)
{
auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(::_fileno(*fp)));
@@ -138,9 +138,9 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename
*fp = nullptr;
}
}
-#endif
+# endif
#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));
if (fd == -1)
@@ -152,9 +152,9 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename
{
::close(fd);
}
-#else
+# else
*fp = ::fopen((filename.c_str()), mode.c_str());
-#endif
+# endif
#endif
return *fp == nullptr;
@@ -187,11 +187,11 @@ SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename
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
struct stat buffer;
@@ -200,9 +200,9 @@ SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT
}
#ifdef _MSC_VER
- // avoid warning about unreachable statement at the end of filesize()
- #pragma warning(push)
- #pragma warning(disable: 4702)
+// avoid warning about unreachable statement at the end of filesize()
+# pragma warning(push)
+# pragma warning(disable : 4702)
#endif
// Return file size according to open FILE* object
@@ -214,49 +214,49 @@ SPDLOG_INLINE size_t filesize(FILE *f)
}
#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)
{
return static_cast<size_t>(ret);
}
-#else // windows 32 bits
+# else // windows 32 bits
long ret = ::_filelength(fd);
if (ret >= 0)
{
return static_cast<size_t>(ret);
}
-#endif
+# endif
#else // unix
// OpenBSD doesn't compile with :: before the fileno(..)
-#if defined(__OpenBSD__)
+# if defined(__OpenBSD__)
int fd = fileno(f);
-#else
+# else
int fd = ::fileno(f);
-#endif
+# endif
// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
-#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
struct stat64 st;
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)
{
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.
}
#ifdef _MSC_VER
- #pragma warning(pop)
+# pragma warning(pop)
#endif
// Return utc offset in minutes or throw spdlog_ex on failure
@@ -264,13 +264,13 @@ 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)
throw_spdlog_ex("Failed getting timezone info. ", errno);
@@ -286,7 +286,7 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
return offset;
#else
-#if defined(sun) || defined(__sun) || defined(_AIX) || (!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
+# if defined(sun) || defined(__sun) || defined(_AIX) || (!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
struct helper
{
@@ -316,9 +316,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
@@ -332,9 +332,9 @@ 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)
-#define SYS_gettid __NR_gettid
-#endif
+# if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
+# define SYS_gettid __NR_gettid
+# endif
return static_cast<size_t>(::syscall(SYS_gettid));
#elif defined(_AIX) || defined(__DragonFly__) || defined(__FreeBSD__)
return static_cast<size_t>(::pthread_getthreadid_np());
@@ -519,11 +519,11 @@ SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target)
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
@@ -580,14 +580,14 @@ 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
-#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
char *buf = ::getenv(field);
return buf ? buf : std::string{};
diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
index 770bb0cf..2b2ffa1d 100644
--- a/include/spdlog/details/os.h
+++ b/include/spdlog/details/os.h
@@ -22,22 +22,22 @@ SPDLOG_API std::tm gmtime() SPDLOG_NOEXCEPT;
// eol definition
#if !defined(SPDLOG_EOL)
-#ifdef _WIN32
-#define SPDLOG_EOL "\r\n"
-#else
-#define SPDLOG_EOL "\n"
-#endif
+# ifdef _WIN32
+# define SPDLOG_EOL "\r\n"
+# else
+# define SPDLOG_EOL "\n"
+# endif
#endif
SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL;
// folder separator
#if !defined(SPDLOG_FOLDER_SEPS)
-#ifdef _WIN32
-#define SPDLOG_FOLDER_SEPS "\\/"
-#else
-#define SPDLOG_FOLDER_SEPS "/"
-#endif
+# ifdef _WIN32
+# define SPDLOG_FOLDER_SEPS "\\/"
+# else
+# define SPDLOG_FOLDER_SEPS "/"
+# endif
#endif
SPDLOG_CONSTEXPR static const char folder_seps[] = SPDLOG_FOLDER_SEPS;
@@ -114,5 +114,5 @@ SPDLOG_API std::string getenv(const char *field);
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "os-inl.h"
+# include "os-inl.h"
#endif
diff --git a/include/spdlog/details/periodic_worker-inl.h b/include/spdlog/details/periodic_worker-inl.h
index 1d794994..d4abbda3 100644
--- a/include/spdlog/details/periodic_worker-inl.h
+++ b/include/spdlog/details/periodic_worker-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/details/periodic_worker.h>
+# include <spdlog/details/periodic_worker.h>
#endif
namespace spdlog {
diff --git a/include/spdlog/details/periodic_worker.h b/include/spdlog/details/periodic_worker.h
index 42373665..a300218d 100644
--- a/include/spdlog/details/periodic_worker.h
+++ b/include/spdlog/details/periodic_worker.h
@@ -36,5 +36,5 @@ private:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "periodic_worker-inl.h"
+# include "periodic_worker-inl.h"
#endif
diff --git a/include/spdlog/details/registry-inl.h b/include/spdlog/details/registry-inl.h
index 6451957a..c55b5eea 100644
--- a/include/spdlog/details/registry-inl.h
+++ b/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>
@@ -14,11 +14,11 @@
#ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
// support for the default stdout color logger
-#ifdef _WIN32
-#include <spdlog/sinks/wincolor_sink.h>
-#else
-#include <spdlog/sinks/ansicolor_sink.h>
-#endif
+# ifdef _WIN32
+# include <spdlog/sinks/wincolor_sink.h>
+# else
+# include <spdlog/sinks/ansicolor_sink.h>
+# endif
#endif // SPDLOG_DISABLE_DEFAULT_LOGGER
#include <chrono>
@@ -36,11 +36,11 @@ SPDLOG_INLINE registry::registry()
#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));
diff --git a/include/spdlog/details/registry.h b/include/spdlog/details/registry.h
index c626104f..97473ea3 100644
--- a/include/spdlog/details/registry.h
+++ b/include/spdlog/details/registry.h
@@ -111,5 +111,5 @@ private:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "registry-inl.h"
+# include "registry-inl.h"
#endif
diff --git a/include/spdlog/details/synchronous_factory.h b/include/spdlog/details/synchronous_factory.h
index 19b40ba1..e1e42268 100644
--- a/include/spdlog/details/synchronous_factory.h
+++ b/include/spdlog/details/synchronous_factory.h
@@ -22,4 +22,3 @@ struct synchronous_factory
}
};
} // namespace spdlog
-
diff --git a/include/spdlog/details/tcp_client.h b/include/spdlog/details/tcp_client.h
index 622e9949..706d7599 100644
--- a/include/spdlog/details/tcp_client.h
+++ b/include/spdlog/details/tcp_client.h
@@ -4,7 +4,7 @@
#pragma once
#ifdef _WIN32
-#error include tcp_client-windows.h instead
+# error include tcp_client-windows.h instead
#endif
// tcp client helper
@@ -111,7 +111,7 @@ public:
#endif
#if !defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
-#error "tcp_sink would raise SIGPIPE since niether SO_NOSIGPIPE nor MSG_NOSIGNAL are available"
+# error "tcp_sink would raise SIGPIPE since niether SO_NOSIGPIPE nor MSG_NOSIGNAL are available"
#endif
}
diff --git a/include/spdlog/details/thread_pool-inl.h b/include/spdlog/details/thread_pool-inl.h
index a0c8a222..deee3766 100644
--- a/include/spdlog/details/thread_pool-inl.h
+++ b/include/spdlog/details/thread_pool-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/details/thread_pool.h>
+# include <spdlog/details/thread_pool.h>
#endif
#include <spdlog/common.h>
diff --git a/include/spdlog/details/thread_pool.h b/include/spdlog/details/thread_pool.h
index 61e25252..aa3cef2b 100644
--- a/include/spdlog/details/thread_pool.h
+++ b/include/spdlog/details/thread_pool.h
@@ -117,5 +117,5 @@ private:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "thread_pool-inl.h"
+# include "thread_pool-inl.h"
#endif
diff --git a/include/spdlog/details/windows_include.h b/include/spdlog/details/windows_include.h
index 6a2f14f9..a92390b9 100644
--- a/include/spdlog/details/windows_include.h
+++ b/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>
diff --git a/include/spdlog/fmt/chrono.h b/include/spdlog/fmt/chrono.h
index e1fb7a06..a0544bca 100644
--- a/include/spdlog/fmt/chrono.h
+++ b/include/spdlog/fmt/chrono.h
@@ -9,12 +9,12 @@
//
#if !defined(SPDLOG_FMT_EXTERNAL)
-#ifdef SPDLOG_HEADER_ONLY
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-#endif
-#include <spdlog/fmt/bundled/chrono.h>
+# ifdef SPDLOG_HEADER_ONLY
+# ifndef FMT_HEADER_ONLY
+# define FMT_HEADER_ONLY
+# endif
+# endif
+# include <spdlog/fmt/bundled/chrono.h>
#else
-#include <fmt/chrono.h>
+# include <fmt/chrono.h>
#endif
diff --git a/include/spdlog/fmt/compile.h b/include/spdlog/fmt/compile.h
index 14b410a1..6f345935 100644
--- a/include/spdlog/fmt/compile.h
+++ b/include/spdlog/fmt/compile.h
@@ -9,12 +9,12 @@
//
#if !defined(SPDLOG_FMT_EXTERNAL)
-#ifdef SPDLOG_HEADER_ONLY
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-#endif
-#include <spdlog/fmt/bundled/compile.h>
+# ifdef SPDLOG_HEADER_ONLY
+# ifndef FMT_HEADER_ONLY
+# define FMT_HEADER_ONLY
+# endif
+# endif
+# include <spdlog/fmt/bundled/compile.h>
#else
-#include <fmt/compile.h>
+# include <fmt/compile.h>
#endif
diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
index bb6cba34..7aaeed81 100644
--- a/include/spdlog/fmt/fmt.h
+++ b/include/spdlog/fmt/fmt.h
@@ -11,18 +11,17 @@
//
#if !defined(SPDLOG_FMT_EXTERNAL)
-#if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
-#define FMT_HEADER_ONLY
-#endif
-#ifndef FMT_USE_WINDOWS_H
-#define FMT_USE_WINDOWS_H 0
-#endif
+# if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
+# define FMT_HEADER_ONLY
+# endif
+# ifndef FMT_USE_WINDOWS_H
+# define FMT_USE_WINDOWS_H 0
+# endif
// enable the 'n' flag in for backward compatibility with fmt 6.x
-#define FMT_DEPRECATED_N_SPECIFIER
-#include <spdlog/fmt/bundled/core.h>
-#include <spdlog/fmt/bundled/format.h>
+# define FMT_DEPRECATED_N_SPECIFIER
+# include <spdlog/fmt/bundled/core.h>
+# include <spdlog/fmt/bundled/format.h>
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-#include <fmt/core.h>
-#include <fmt/format.h>
+# include <fmt/core.h>
+# include <fmt/format.h>
#endif
-
diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
index f82eb679..9d8efe38 100644
--- a/include/spdlog/fmt/ostr.h
+++ b/include/spdlog/fmt/ostr.h
@@ -9,12 +9,12 @@
//
#if !defined(SPDLOG_FMT_EXTERNAL)
-#ifdef SPDLOG_HEADER_ONLY
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-#endif
-#include <spdlog/fmt/bundled/ostream.h>
+# ifdef SPDLOG_HEADER_ONLY
+# ifndef FMT_HEADER_ONLY
+# define FMT_HEADER_ONLY
+# endif
+# endif
+# include <spdlog/fmt/bundled/ostream.h>
#else
-#include <fmt/ostream.h>
+# include <fmt/ostream.h>
#endif
diff --git a/include/spdlog/fmt/xchar.h b/include/spdlog/fmt/xchar.h
index e75f32f2..616d8f5b 100644
--- a/include/spdlog/fmt/xchar.h
+++ b/include/spdlog/fmt/xchar.h
@@ -9,12 +9,12 @@
//
#if !defined(SPDLOG_FMT_EXTERNAL)
-#ifdef SPDLOG_HEADER_ONLY
-#ifndef FMT_HEADER_ONLY
-#define FMT_HEADER_ONLY
-#endif
-#endif
-#include <spdlog/fmt/bundled/xchar.h>
+# ifdef SPDLOG_HEADER_ONLY
+# ifndef FMT_HEADER_ONLY
+# define FMT_HEADER_ONLY
+# endif
+# endif
+# include <spdlog/fmt/bundled/xchar.h>
#else
-#include <fmt/xchar.h>
+# include <fmt/xchar.h>
#endif
diff --git a/include/spdlog/logger-inl.h b/include/spdlog/logger-inl.h
index d01c08da..fd841657 100644
--- a/include/spdlog/logger-inl.h
+++ b/include/spdlog/logger-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/logger.h>
+# include <spdlog/logger.h>
#endif
#include <spdlog/sinks/sink.h>
diff --git a/include/spdlog/pattern_formatter-inl.h b/include/spdlog/pattern_formatter-inl.h
index c6cd5e83..ec727032 100644
--- a/include/spdlog/pattern_formatter-inl.h
+++ b/include/spdlog/pattern_formatter-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/pattern_formatter.h>
+# include <spdlog/pattern_formatter.h>
#endif
#include <spdlog/details/fmt_helper.h>
@@ -817,9 +817,9 @@ public:
{}
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4127) // consider using 'if constexpr' instead
-#endif // _MSC_VER
+# pragma warning(push)
+# pragma warning(disable : 4127) // consider using 'if constexpr' instead
+#endif // _MSC_VER
static const char *basename(const char *filename)
{
// if the size is 2 (1 character + null terminator) we can use the more efficient strrchr
@@ -831,15 +831,15 @@ public:
}
else
{
- const std::reverse_iterator<const char*> begin(filename + std::strlen(filename));
- const std::reverse_iterator<const char*> end(filename);
+ const std::reverse_iterator<const char *> begin(filename + std::strlen(filename));
+ const std::reverse_iterator<const char *> end(filename);
const auto it = std::find_first_of(begin, end, std::begin(os::folder_seps), std::end(os::folder_seps) - 1);
return it != end ? it.base() : filename;
}
}
#ifdef _MSC_VER
-#pragma warning(pop)
+# pragma warning(pop)
#endif // _MSC_VER
void format(const details::log_msg &msg, const std::tm &, memory_buf_t &dest) override
diff --git a/include/spdlog/pattern_formatter.h b/include/spdlog/pattern_formatter.h
index bc13ae10..e9ccfaa7 100644
--- a/include/spdlog/pattern_formatter.h
+++ b/include/spdlog/pattern_formatter.h
@@ -92,7 +92,7 @@ public:
void format(const details::log_msg &msg, memory_buf_t &dest) override;
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;
@@ -122,5 +122,5 @@ private:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "pattern_formatter-inl.h"
+# include "pattern_formatter-inl.h"
#endif
diff --git a/include/spdlog/sinks/android_sink.h b/include/spdlog/sinks/android_sink.h
index 9686adff..42935a7c 100644
--- a/include/spdlog/sinks/android_sink.h
+++ b/include/spdlog/sinks/android_sink.h
@@ -5,21 +5,21 @@
#ifdef __ANDROID__
-#include <spdlog/details/fmt_helper.h>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/details/os.h>
-#include <spdlog/sinks/base_sink.h>
-#include <spdlog/details/synchronous_factory.h>
-
-#include <android/log.h>
-#include <chrono>
-#include <mutex>
-#include <string>
-#include <thread>
-
-#if !defined(SPDLOG_ANDROID_RETRIES)
-#define SPDLOG_ANDROID_RETRIES 2
-#endif
+# include <spdlog/details/fmt_helper.h>
+# include <spdlog/details/null_mutex.h>
+# include <spdlog/details/os.h>
+# include <spdlog/sinks/base_sink.h>
+# include <spdlog/details/synchronous_factory.h>
+
+# include <android/log.h>
+# include <chrono>
+# include <mutex>
+# include <string>
+# include <thread>
+
+# if !defined(SPDLOG_ANDROID_RETRIES)
+# define SPDLOG_ANDROID_RETRIES 2
+# endif
namespace spdlog {
namespace sinks {
diff --git a/include/spdlog/sinks/ansicolor_sink-inl.h b/include/spdlog/sinks/ansicolor_sink-inl.h
index 61c0a719..d8db423c 100644
--- a/include/spdlog/sinks/ansicolor_sink-inl.h
+++ b/include/spdlog/sinks/ansicolor_sink-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/sinks/ansicolor_sink.h>
+# include <spdlog/sinks/ansicolor_sink.h>
#endif
#include <spdlog/pattern_formatter.h>
diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h
index 4438f706..39d966bc 100644
--- a/include/spdlog/sinks/ansicolor_sink.h
+++ b/include/spdlog/sinks/ansicolor_sink.h
@@ -114,5 +114,5 @@ using ansicolor_stderr_sink_st = ansicolor_stderr_sink<details::console_nullmute
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "ansicolor_sink-inl.h"
+# include "ansicolor_sink-inl.h"
#endif
diff --git a/include/spdlog/sinks/base_sink-inl.h b/include/spdlog/sinks/base_sink-inl.h
index b15fb0e6..421fdf9d 100644
--- a/include/spdlog/sinks/base_sink-inl.h
+++ b/include/spdlog/sinks/base_sink-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/sinks/base_sink.h>
+# include <spdlog/sinks/base_sink.h>
#endif
#include <spdlog/common.h>
diff --git a/include/spdlog/sinks/base_sink.h b/include/spdlog/sinks/base_sink.h
index 0647f0c4..a0624e94 100644
--- a/include/spdlog/sinks/base_sink.h
+++ b/include/spdlog/sinks/base_sink.h
@@ -48,5 +48,5 @@ protected:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "base_sink-inl.h"
+# include "base_sink-inl.h"
#endif
diff --git a/include/spdlog/sinks/basic_file_sink-inl.h b/include/spdlog/sinks/basic_file_sink-inl.h
index 1260d15c..e903dd93 100644
--- a/include/spdlog/sinks/basic_file_sink-inl.h
+++ b/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>
diff --git a/include/spdlog/sinks/basic_file_sink.h b/include/spdlog/sinks/basic_file_sink.h
index 62079d91..047bc8ce 100644
--- a/include/spdlog/sinks/basic_file_sink.h
+++ b/include/spdlog/sinks/basic_file_sink.h
@@ -54,6 +54,5 @@ inline std::shared_ptr<logger> basic_logger_st(const std::string &logger_name, c
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "basic_file_sink-inl.h"
+# include "basic_file_sink-inl.h"
#endif
-
diff --git a/include/spdlog/sinks/hourly_file_sink.h b/include/spdlog/sinks/hourly_file_sink.h
index f5e34366..e75ab4db 100644
--- a/include/spdlog/sinks/hourly_file_sink.h
+++ b/include/spdlog/sinks/hourly_file_sink.h
@@ -31,8 +31,8 @@ struct hourly_filename_calculator
{
filename_t basename, ext;
std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
- return fmt::format(
- SPDLOG_FILENAME_T("{}_{:04d}{:02d}{:02d}_{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday, now_tm.tm_hour, ext);
+ return fmt::format(SPDLOG_FILENAME_T("{}_{:04d}{:02d}{:02d}_{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1,
+ now_tm.tm_mday, now_tm.tm_hour, ext);
}
};
diff --git a/include/spdlog/sinks/mongo_sink.h b/include/spdlog/sinks/mongo_sink.h
index f924f4fb..048b457c 100644
--- a/include/spdlog/sinks/mongo_sink.h
+++ b/include/spdlog/sinks/mongo_sink.h
@@ -8,7 +8,7 @@
// Building and using requires mongocxx library.
// For building mongocxx library check the url below
// http://mongocxx.org/mongocxx-v3/installation/
-//
+//
#include "spdlog/common.h"
#include "spdlog/details/log_msg.h"
@@ -25,45 +25,52 @@
namespace spdlog {
namespace sinks {
-template <typename Mutex> class mongo_sink : public base_sink<Mutex> {
+template<typename 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") {
- try {
- client_ = std::make_unique<mongocxx::client>(mongocxx::uri{uri});
- db_name_ = db_name;
- coll_name_ = collection_name;
- } catch (const std::exception) {
- throw spdlog_ex("Error opening database");
+ mongo_sink(const std::string &db_name, const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+ {
+ try
+ {
+ client_ = std::make_unique<mongocxx::client>(mongocxx::uri{uri});
+ db_name_ = db_name;
+ coll_name_ = collection_name;
+ }
+ catch (const std::exception)
+ {
+ throw spdlog_ex("Error opening database");
+ }
}
- }
- ~mongo_sink() { flush_(); }
+ ~mongo_sink()
+ {
+ flush_();
+ }
protected:
- void sink_it_(const details::log_msg &msg) override {
- using bsoncxx::builder::stream::document;
- using bsoncxx::builder::stream::finalize;
-
- if (client_ != nullptr) {
- auto doc = document{}
- << "timestamp" << bsoncxx::types::b_date(msg.time) << "level"
- << level::to_string_view(msg.level).data() << "message"
- << std::string(msg.payload.begin(), msg.payload.end())
- << "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());
+ void sink_it_(const details::log_msg &msg) override
+ {
+ using bsoncxx::builder::stream::document;
+ using bsoncxx::builder::stream::finalize;
+
+ if (client_ != nullptr)
+ {
+ auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level" << level::to_string_view(msg.level).data()
+ << "message" << std::string(msg.payload.begin(), msg.payload.end()) << "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());
+ }
}
- }
- void flush_() override {}
+ void flush_() override {}
private:
- static mongocxx::instance instance_;
- std::string db_name_;
- std::string coll_name_;
- std::unique_ptr<mongocxx::client> client_ = nullptr;
+ static mongocxx::instance instance_;
+ std::string db_name_;
+ std::string coll_name_;
+ std::unique_ptr<mongocxx::client> client_ = nullptr;
};
mongocxx::instance mongo_sink<std::mutex>::instance_{};
@@ -73,24 +80,19 @@ using mongo_sink_mt = mongo_sink<std::mutex>;
using mongo_sink_st = mongo_sink<spdlog::details::null_mutex>;
} // namespace sinks
-
- template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger>
-mongo_logger_mt(const std::string &logger_name, const std::string &db_name,
- 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>
+inline std::shared_ptr<logger> mongo_logger_mt(const std::string &logger_name, const std::string &db_name,
+ 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>
-inline std::shared_ptr<logger>
-mongo_logger_st(const std::string &logger_name, const std::string &db_name,
- 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);
+template<typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> mongo_logger_st(const std::string &logger_name, const std::string &db_name,
+ 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
diff --git a/include/spdlog/sinks/msvc_sink.h b/include/spdlog/sinks/msvc_sink.h
index 8fec428d..2ac4a965 100644
--- a/include/spdlog/sinks/msvc_sink.h
+++ b/include/spdlog/sinks/msvc_sink.h
@@ -5,12 +5,11 @@
#if defined(_WIN32)
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
-
-#include <mutex>
-#include <string>
+# include <spdlog/details/null_mutex.h>
+# include <spdlog/sinks/base_sink.h>
+# include <mutex>
+# include <string>
// Avoid including windows.h (https://stackoverflow.com/a/30741042)
extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
diff --git a/include/spdlog/sinks/qt_sinks.h b/include/spdlog/sinks/qt_sinks.h
index fbc4a2e8..5a9a83da 100644
--- a/include/spdlog/sinks/qt_sinks.h
+++ b/include/spdlog/sinks/qt_sinks.h
@@ -1,187 +1,200 @@
-// Copyright(c) 2015-present, Gabi Melman, mguludag and spdlog contributors.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#pragma once
-
-//
-// Custom sink for QPlainTextEdit or QTextEdit and its children(QTextBrowser...
-// etc) Building and using requires Qt library.
-//
-
-#include "spdlog/common.h"
-#include "spdlog/details/log_msg.h"
-#include "spdlog/details/synchronous_factory.h"
-#include "spdlog/sinks/base_sink.h"
-
-#include <QObject>
-#include <QPlainTextEdit>
-#include <QTextEdit>
-
-namespace _spdlog_p {
-namespace _sinks_p {
-//
-// Private class for QTextEdit and its derivatives
-//
-class qtextedit_sink_p : public QObject {
- Q_OBJECT
-public:
- qtextedit_sink_p(QTextEdit *textedit = nullptr) {
- if (textedit != nullptr) {
- textedit_ = textedit;
- connect(this, &qtextedit_sink_p::append_text, textedit_,
- &QTextEdit::append);
- }
- }
-
- ~qtextedit_sink_p() {}
-
- void append(const spdlog::string_view_t &str) {
- emit append_text(
- QString::fromUtf8(str.data(), static_cast<int>(str.size() - 2)));
- }
-
-signals:
- void append_text(const QString &);
-
-private:
- QTextEdit *textedit_ = nullptr;
-};
-
-//
-// Private class for QPlainTextEdit
-//
-class qplaintextedit_sink_p : public QObject {
- Q_OBJECT
-public:
- qplaintextedit_sink_p(QPlainTextEdit *textedit = nullptr) {
- if (textedit != nullptr) {
- textedit_ = textedit;
- connect(this, &qplaintextedit_sink_p::append_text, textedit_,
- &QPlainTextEdit::appendPlainText);
- }
- }
-
- ~qplaintextedit_sink_p() {}
-
- void append(const spdlog::string_view_t &str) {
- emit append_text(
- QString::fromUtf8(str.data(), static_cast<int>(str.size() - 2)));
- }
-
-signals:
- void append_text(const QString &);
-
-private:
- QPlainTextEdit *textedit_ = nullptr;
-};
-} // namespace _sinks_p
-} // namespace _spdlog_p
-
-//
-// qtextedit_sink class
-//
-namespace spdlog {
-namespace sinks {
-template <typename Mutex> class qtextedit_sink : public base_sink<Mutex> {
-public:
- qtextedit_sink(QTextEdit *textedit = nullptr) {
- if (textedit != nullptr) {
- textedit_p =
- std::make_shared<_spdlog_p::_sinks_p::qtextedit_sink_p>(textedit);
- } else {
- throw spdlog_ex("Error opening QTextEdit");
- }
- }
-
- ~qtextedit_sink() { flush_(); }
-
-protected:
- void sink_it_(const details::log_msg &msg) override {
- memory_buf_t formatted;
- base_sink<Mutex>::formatter_->format(msg, formatted);
- string_view_t str_v = string_view_t(formatted.data(), formatted.size());
- textedit_p->append(str_v);
- }
-
- void flush_() override {}
-
-private:
- std::shared_ptr<_spdlog_p::_sinks_p::qtextedit_sink_p> textedit_p = nullptr;
-};
-
-//
-// qplaintextedit_sink class
-//
-template <typename Mutex> class qplaintextedit_sink : public base_sink<Mutex> {
-public:
- qplaintextedit_sink(QPlainTextEdit *textedit = nullptr) {
- if (textedit != nullptr) {
- textedit_p = std::make_shared<_spdlog_p::_sinks_p::qplaintextedit_sink_p>(
- textedit);
- } else {
- throw spdlog_ex("Error opening QPlainTextEdit");
- }
- }
-
- ~qplaintextedit_sink() { flush_(); }
-
-protected:
- void sink_it_(const details::log_msg &msg) override {
- memory_buf_t formatted;
- base_sink<Mutex>::formatter_->format(msg, formatted);
- string_view_t str_v = string_view_t(formatted.data(), formatted.size());
- textedit_p->append(str_v);
- }
-
- void flush_() override {}
-
-private:
- std::shared_ptr<_spdlog_p::_sinks_p::qplaintextedit_sink_p> textedit_p =
- nullptr;
-};
-
-#include "spdlog/details/null_mutex.h"
-#include <mutex>
-using qtextedit_sink_mt = qtextedit_sink<std::mutex>;
-using qtextedit_sink_st = qtextedit_sink<spdlog::details::null_mutex>;
-
-using qplaintextedit_sink_mt = qplaintextedit_sink<std::mutex>;
-using qplaintextedit_sink_st = qplaintextedit_sink<spdlog::details::null_mutex>;
-
-} // namespace sinks
-
-//
-// Factory functions
-//
-template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger>
-qtextedit_logger_mt(const std::string &logger_name,
- QTextEdit *qtextedit = nullptr) {
- return Factory::template create<sinks::qtextedit_sink_mt>(logger_name,
- qtextedit);
-}
-
-template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger>
-qtextedit_logger_st(const std::string &logger_name,
- QTextEdit *qtextedit = nullptr) {
- return Factory::template create<sinks::qtextedit_sink_st>(logger_name,
- qtextedit);
-}
-
-template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger>
-qplaintextedit_logger_mt(const std::string &logger_name,
- QPlainTextEdit *qplaintextedit = nullptr) {
- return Factory::template create<sinks::qplaintextedit_sink_mt>(
- logger_name, qplaintextedit);
-}
-
-template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger>
-qplaintextedit_logger_st(const std::string &logger_name,
- QPlainTextEdit *qplaintextedit = nullptr) {
- return Factory::template create<sinks::qplaintextedit_sink_st>(
- logger_name, qplaintextedit);
-}
-} // namespace spdlog
+// Copyright(c) 2015-present, Gabi Melman, mguludag and spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+//
+// Custom sink for QPlainTextEdit or QTextEdit and its children(QTextBrowser...
+// etc) Building and using requires Qt library.
+//
+
+#include "spdlog/common.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/synchronous_factory.h"
+#include "spdlog/sinks/base_sink.h"
+
+#include <QObject>
+#include <QPlainTextEdit>
+#include <QTextEdit>
+
+namespace _spdlog_p {
+namespace _sinks_p {
+//
+// Private class for QTextEdit and its derivatives
+//
+class qtextedit_sink_p : public QObject
+{
+ Q_OBJECT
+public:
+ qtextedit_sink_p(QTextEdit *textedit = nullptr)
+ {
+ if (textedit != nullptr)
+ {
+ textedit_ = textedit;
+ connect(this, &qtextedit_sink_p::append_text, textedit_, &QTextEdit::append);
+ }
+ }
+
+ ~qtextedit_sink_p() {}
+
+ void append(const spdlog::string_view_t &str)
+ {
+ emit append_text(QString::fromUtf8(str.data(), static_cast<int>(str.size() - 2)));
+ }
+
+signals:
+ void append_text(const QString &);
+
+private:
+ QTextEdit *textedit_ = nullptr;
+};
+
+//
+// Private class for QPlainTextEdit
+//
+class qplaintextedit_sink_p : public QObject
+{
+ Q_OBJECT
+public:
+ qplaintextedit_sink_p(QPlainTextEdit *textedit = nullptr)
+ {
+ if (textedit != nullptr)
+ {
+ textedit_ = textedit;
+ connect(this, &qplaintextedit_sink_p::append_text, textedit_, &QPlainTextEdit::appendPlainText);
+ }
+ }
+
+ ~qplaintextedit_sink_p() {}
+
+ void append(const spdlog::string_view_t &str)
+ {
+ emit append_text(QString::fromUtf8(str.data(), static_cast<int>(str.size() - 2)));
+ }
+
+signals:
+ void append_text(const QString &);
+
+private:
+ QPlainTextEdit *textedit_ = nullptr;
+};
+} // namespace _sinks_p
+} // namespace _spdlog_p
+
+//
+// qtextedit_sink class
+//
+namespace spdlog {
+namespace sinks {
+template<typename Mutex>
+class qtextedit_sink : public base_sink<Mutex>
+{
+public:
+ qtextedit_sink(QTextEdit *textedit = nullptr)
+ {
+ if (textedit != nullptr)
+ {
+ textedit_p = std::make_shared<_spdlog_p::_sinks_p::qtextedit_sink_p>(textedit);
+ }
+ else
+ {
+ throw spdlog_ex("Error opening QTextEdit");
+ }
+ }
+
+ ~qtextedit_sink()
+ {
+ flush_();
+ }
+
+protected:
+ void sink_it_(const details::log_msg &msg) override
+ {
+ memory_buf_t formatted;
+ base_sink<Mutex>::formatter_->format(msg, formatted);
+ string_view_t str_v = string_view_t(formatted.data(), formatted.size());
+ textedit_p->append(str_v);
+ }
+
+ void flush_() override {}
+
+private:
+ std::shared_ptr<_spdlog_p::_sinks_p::qtextedit_sink_p> textedit_p = nullptr;
+};
+
+//
+// qplaintextedit_sink class
+//
+template<typename Mutex>
+class qplaintextedit_sink : public base_sink<Mutex>
+{
+public:
+ qplaintextedit_sink(QPlainTextEdit *textedit = nullptr)
+ {
+ if (textedit != nullptr)
+ {
+ textedit_p = std::make_shared<_spdlog_p::_sinks_p::qplaintextedit_sink_p>(textedit);
+ }
+ else
+ {
+ throw spdlog_ex("Error opening QPlainTextEdit");
+ }
+ }
+
+ ~qplaintextedit_sink()
+ {
+ flush_();
+ }
+
+protected:
+ void sink_it_(const details::log_msg &msg) override
+ {
+ memory_buf_t formatted;
+ base_sink<Mutex>::formatter_->format(msg, formatted);
+ string_view_t str_v = string_view_t(formatted.data(), formatted.size());
+ textedit_p->append(str_v);
+ }
+
+ void flush_() override {}
+
+private:
+ std::shared_ptr<_spdlog_p::_sinks_p::qplaintextedit_sink_p> textedit_p = nullptr;
+};
+
+#include "spdlog/details/null_mutex.h"
+#include <mutex>
+using qtextedit_sink_mt = qtextedit_sink<std::mutex>;
+using qtextedit_sink_st = qtextedit_sink<spdlog::details::null_mutex>;
+
+using qplaintextedit_sink_mt = qplaintextedit_sink<std::mutex>;
+using qplaintextedit_sink_st = qplaintextedit_sink<spdlog::details::null_mutex>;
+
+} // namespace sinks
+
+//
+// Factory functions
+//
+template<typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qtextedit_logger_mt(const std::string &logger_name, QTextEdit *qtextedit = nullptr)
+{
+ return Factory::template create<sinks::qtextedit_sink_mt>(logger_name, qtextedit);
+}
+
+template<typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qtextedit_logger_st(const std::string &logger_name, QTextEdit *qtextedit = nullptr)
+{
+ return Factory::template create<sinks::qtextedit_sink_st>(logger_name, qtextedit);
+}
+
+template<typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qplaintextedit_logger_mt(const std::string &logger_name, QPlainTextEdit *qplaintextedit = nullptr)
+{
+ return Factory::template create<sinks::qplaintextedit_sink_mt>(logger_name, qplaintextedit);
+}
+
+template<typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qplaintextedit_logger_st(const std::string &logger_name, QPlainTextEdit *qplaintextedit = nullptr)
+{
+ return Factory::template create<sinks::qplaintextedit_sink_st>(logger_name, qplaintextedit);
+}
+} // namespace spdlog
diff --git a/include/spdlog/sinks/rotating_file_sink-inl.h b/include/spdlog/sinks/rotating_file_sink-inl.h
index d715ebf3..f31f5319 100644
--- a/include/spdlog/sinks/rotating_file_sink-inl.h
+++ b/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>
diff --git a/include/spdlog/sinks/rotating_file_sink.h b/include/spdlog/sinks/rotating_file_sink.h
index e1e85a7d..842527ef 100644
--- a/include/spdlog/sinks/rotating_file_sink.h
+++ b/include/spdlog/sinks/rotating_file_sink.h
@@ -74,5 +74,5 @@ inline std::shared_ptr<logger> rotating_logger_st(
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "rotating_file_sink-inl.h"
+# include "rotating_file_sink-inl.h"
#endif
diff --git a/include/spdlog/sinks/sink-inl.h b/include/spdlog/sinks/sink-inl.h
index a8dd6a6c..df07adda 100644
--- a/include/spdlog/sinks/sink-inl.h
+++ b/include/spdlog/sinks/sink-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/sinks/sink.h>
+# include <spdlog/sinks/sink.h>
#endif
#include <spdlog/common.h>
diff --git a/include/spdlog/sinks/sink.h b/include/spdlog/sinks/sink.h
index be99744d..0a28cccc 100644
--- a/include/spdlog/sinks/sink.h
+++ b/include/spdlog/sinks/sink.h
@@ -31,5 +31,5 @@ protected:
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "sink-inl.h"
+# include "sink-inl.h"
#endif
diff --git a/include/spdlog/sinks/stdout_color_sinks-inl.h b/include/spdlog/sinks/stdout_color_sinks-inl.h
index 4e2a649a..066df182 100644
--- a/include/spdlog/sinks/stdout_color_sinks-inl.h
+++ b/include/spdlog/sinks/stdout_color_sinks-inl.h
@@ -4,7 +4,7 @@
#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>
@@ -36,4 +36,3 @@ SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_
return Factory::template create<sinks::stderr_color_sink_st>(logger_name, mode);
}
} // namespace spdlog
-
diff --git a/include/spdlog/sinks/stdout_color_sinks.h b/include/spdlog/sinks/stdout_color_sinks.h
index e67aa91b..420b13ab 100644
--- a/include/spdlog/sinks/stdout_color_sinks.h
+++ b/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>
@@ -41,5 +41,5 @@ std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mo
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "stdout_color_sinks-inl.h"
+# include "stdout_color_sinks-inl.h"
#endif
diff --git a/include/spdlog/sinks/stdout_sinks-inl.h b/include/spdlog/sinks/stdout_sinks-inl.h
index 9122152a..c14066b9 100644
--- a/include/spdlog/sinks/stdout_sinks-inl.h
+++ b/include/spdlog/sinks/stdout_sinks-inl.h
@@ -4,7 +4,7 @@
#pragma once
#ifndef SPDLOG_HEADER_ONLY
-#include <spdlog/sinks/stdout_sinks.h>
+# include <spdlog/sinks/stdout_sinks.h>
#endif
#include <spdlog/details/console_globals.h>
@@ -14,15 +14,15 @@
#ifdef _WIN32
// under windows using fwrite to non-binary stream results in \r\r\n (see issue #1675)
// so instead we use ::FileWrite
-#include <spdlog/details/windows_include.h>
+# include <spdlog/details/windows_include.h>
-#ifndef _USING_V110_SDK71_ // fileapi.h doesnt exist in winxp
-#include <fileapi.h> // WriteFile (..)
-#endif
+# ifndef _USING_V110_SDK71_ // fileapi.h doesnt exist in winxp
+# include <fileapi.h> // WriteFile (..)
+# endif
-#include <io.h> // _get_osfhandle(..)
-#include <stdio.h> // _fileno(..)
-#endif // WIN32
+# include <io.h> // _get_osfhandle(..)
+# include <stdio.h> // _fileno(..)
+#endif // WIN32
namespace spdlog {
@@ -36,9 +36,9 @@ SPDLOG_INLINE stdout_sink_base<ConsoleMutex>::stdout_sink_base(FILE *file)
{
#ifdef _WIN32
// get windows handle from the FILE* object
-
- handle_ = (HANDLE)::_get_osfhandle(::_fileno(file_));
-
+
+ handle_ = (HANDLE)::_get_osfhandle(::_fileno(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).
@@ -54,7 +54,7 @@ SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &m
{
#ifdef _WIN32
if (handle_ == INVALID_HANDLE_VALUE)
- {
+ {
return;
}
std::lock_guard<mutex_t> lock(mutex_);
@@ -74,7 +74,7 @@ SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &m
formatter_->format(msg, formatted);
::fwrite(formatted.data(), sizeof(char), formatted.size(), file_);
::fflush(file_); // flush every line to terminal
-#endif // WIN32
+#endif // WIN32
}
template<typename ConsoleMutex>
diff --git a/include/spdlog/sinks/stdout_sinks.h b/include/spdlog/sinks/stdout_sinks.h
index 40688a46..6fdc0de3 100644
--- a/include/spdlog/sinks/stdout_sinks.h
+++ b/include/spdlog/sinks/stdout_sinks.h
@@ -9,7 +9,7 @@
#include <cstdio>
#ifdef _WIN32
-#include <spdlog/details/windows_include.h>
+# include <spdlog/details/windows_include.h>
#endif
namespace spdlog {
@@ -41,7 +41,7 @@ protected:
FILE *file_;
std::unique_ptr<spdlog::formatter> formatter_;
#ifdef _WIN32
- HANDLE handle_;
+ HANDLE handle_;
#endif // WIN32
};
@@ -83,5 +83,5 @@ std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name);
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "stdout_sinks-inl.h"
+# include "stdout_sinks-inl.h"
#endif
diff --git a/include/spdlog/sinks/systemd_sink.h b/include/spdlog/sinks/systemd_sink.h
index d23824b8..e3d513a0 100644
--- a/include/spdlog/sinks/systemd_sink.h
+++ b/include/spdlog/sinks/systemd_sink.h
@@ -9,7 +9,7 @@
#include <array>
#ifndef SD_JOURNAL_SUPPRESS_LOCATION
-#define SD_JOURNAL_SUPPRESS_LOCATION
+# define SD_JOURNAL_SUPPRESS_LOCATION
#endif
#include <systemd/sd-journal.h>
diff --git a/include/spdlog/sinks/tcp_sink.h b/include/spdlog/sinks/tcp_sink.h
index 9dd9e51d..e0efb31d 100644
--- a/include/spdlog/sinks/tcp_sink.h
+++ b/include/spdlog/sinks/tcp_sink.h
@@ -7,9 +7,9 @@
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.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>
diff --git a/include/spdlog/sinks/win_eventlog_sink.h b/include/spdlog/sinks/win_eventlog_sink.h
index 68170dd9..5e70599a 100644
--- a/include/spdlog/sinks/win_eventlog_sink.h
+++ b/include/spdlog/sinks/win_eventlog_sink.h
@@ -229,11 +229,11 @@ protected:
LPCWSTR lp_wstr = buf.data();
succeeded = ::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);
+ current_user_sid_.as_sid(), 1, 0, &lp_wstr, nullptr);
#else
LPCSTR lp_str = formatted.data();
succeeded = ::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);
+ current_user_sid_.as_sid(), 1, 0, &lp_str, nullptr);
#endif
if (!succeeded)
diff --git a/include/spdlog/sinks/wincolor_sink-inl.h b/include/spdlog/sinks/wincolor_sink-inl.h
index e2676d3c..be3d80a2 100644
--- a/include/spdlog/sinks/wincolor_sink-inl.h
+++ b/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>
@@ -129,10 +129,10 @@ std::uint16_t SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_foreground_color_(s
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;
+ return FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
}
-
- // change only the foreground bits (lowest 4 bits)
+
+ // 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));
(void)(ignored);
diff --git a/include/spdlog/sinks/wincolor_sink.h b/include/spdlog/sinks/wincolor_sink.h
index a82f1b24..9b030fc1 100644
--- a/include/spdlog/sinks/wincolor_sink.h
+++ b/include/spdlog/sinks/wincolor_sink.h
@@ -23,7 +23,7 @@ namespace sinks {
template<typename ConsoleMutex>
class wincolor_sink : public sink
{
-public:
+public:
wincolor_sink(void *out_handle, color_mode mode);
~wincolor_sink() override;
@@ -41,7 +41,7 @@ public:
protected:
using mutex_t = typename ConsoleMutex::mutex_t;
void *out_handle_;
- mutex_t &mutex_;
+ mutex_t &mutex_;
bool should_do_colors_;
std::unique_ptr<spdlog::formatter> formatter_;
std::array<std::uint16_t, level::n_levels> colors_;
@@ -81,5 +81,5 @@ using wincolor_stderr_sink_st = wincolor_stderr_sink<details::console_nullmutex>
} // namespace spdlog
#ifdef SPDLOG_HEADER_ONLY
-#include "wincolor_sink-inl.h"
+# include "wincolor_sink-inl.h"
#endif
diff --git a/include/spdlog/spdlog-inl.h b/include/spdlog/spdlog-inl.h
index 96e09f59..2b875fae 100644
--- a/include/spdlog/spdlog-inl.h
+++ b/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>
diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
index bb130d94..41c6bbb8 100644
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -128,49 +128,49 @@ SPDLOG_API spdlog::logger *default_logger_raw();
SPDLOG_API void set_default_logger(std::shared_ptr<spdlog::logger> default_logger);
template<typename FormatString, typename... Args>
-inline void log(source_loc source, level::level_enum lvl, const FormatString &fmt, Args&&...args)
+inline void log(source_loc source, level::level_enum lvl, const FormatString &fmt, Args &&...args)
{
default_logger_raw()->log(source, lvl, fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void log(level::level_enum lvl, const FormatString &fmt, Args&&...args)
+inline void log(level::level_enum lvl, const FormatString &fmt, Args &&...args)
{
default_logger_raw()->log(source_loc{}, lvl, fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void trace(const FormatString &fmt, Args&&...args)
+inline void trace(const FormatString &fmt, Args &&...args)
{
default_logger_raw()->trace(fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void debug(const FormatString &fmt, Args&&...args)
+inline void debug(const FormatString &fmt, Args &&...args)
{
default_logger_raw()->debug(fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void info(const FormatString &fmt, Args&&...args)
+inline void info(const FormatString &fmt, Args &&...args)
{
default_logger_raw()->info(fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void warn(const FormatString &fmt, Args&&...args)
+inline void warn(const FormatString &fmt, Args &&...args)
{
default_logger_raw()->warn(fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void error(const FormatString &fmt, Args&&...args)
+inline void error(const FormatString &fmt, Args &&...args)
{
default_logger_raw()->error(fmt, std::forward<Args>(args)...);
}
template<typename FormatString, typename... Args>
-inline void critical(const FormatString &fmt, Args&&...args)
+inline void critical(const FormatString &fmt, Args &&...args)
{
default_logger_raw()->critical(fmt, std::forward<Args>(args)...);
}
@@ -241,55 +241,55 @@ inline void critical(const T &msg)
#define SPDLOG_LOGGER_CALL(logger, level, ...) (logger)->log(spdlog::source_loc{__FILE__, __LINE__, SPDLOG_FUNCTION}, level, __VA_ARGS__)
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE
-#define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__)
-#define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__)
+# define SPDLOG_LOGGER_TRACE(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::trace, __VA_ARGS__)
+# define SPDLOG_TRACE(...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(), __VA_ARGS__)
#else
-#define SPDLOG_LOGGER_TRACE(logger, ...) (void)0
-#define SPDLOG_TRACE(...) (void)0
+# define SPDLOG_LOGGER_TRACE(logger, ...) (void)0
+# define SPDLOG_TRACE(...) (void)0
#endif
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_DEBUG
-#define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__)
-#define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__)
+# define SPDLOG_LOGGER_DEBUG(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::debug, __VA_ARGS__)
+# define SPDLOG_DEBUG(...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(), __VA_ARGS__)
#else
-#define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0
-#define SPDLOG_DEBUG(...) (void)0
+# define SPDLOG_LOGGER_DEBUG(logger, ...) (void)0
+# define SPDLOG_DEBUG(...) (void)0
#endif
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_INFO
-#define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__)
-#define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__)
+# define SPDLOG_LOGGER_INFO(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::info, __VA_ARGS__)
+# define SPDLOG_INFO(...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(), __VA_ARGS__)
#else
-#define SPDLOG_LOGGER_INFO(logger, ...) (void)0
-#define SPDLOG_INFO(...) (void)0
+# define SPDLOG_LOGGER_INFO(logger, ...) (void)0
+# define SPDLOG_INFO(...) (void)0
#endif
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_WARN
-#define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__)
-#define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__)
+# define SPDLOG_LOGGER_WARN(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::warn, __VA_ARGS__)
+# define SPDLOG_WARN(...) SPDLOG_LOGGER_WARN(spdlog::default_logger_raw(), __VA_ARGS__)
#else
-#define SPDLOG_LOGGER_WARN(logger, ...) (void)0
-#define SPDLOG_WARN(...) (void)0
+# define SPDLOG_LOGGER_WARN(logger, ...) (void)0
+# define SPDLOG_WARN(...) (void)0
#endif
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_ERROR
-#define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__)
-#define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__)
+# define SPDLOG_LOGGER_ERROR(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::err, __VA_ARGS__)
+# define SPDLOG_ERROR(...) SPDLOG_LOGGER_ERROR(spdlog::default_logger_raw(), __VA_ARGS__)
#else
-#define SPDLOG_LOGGER_ERROR(logger, ...) (void)0
-#define SPDLOG_ERROR(...) (void)0
+# define SPDLOG_LOGGER_ERROR(logger, ...) (void)0
+# define SPDLOG_ERROR(...) (void)0
#endif
#if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_CRITICAL
-#define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__)
-#define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__)
+# define SPDLOG_LOGGER_CRITICAL(logger, ...) SPDLOG_LOGGER_CALL(logger, spdlog::level::critical, __VA_ARGS__)
+# define SPDLOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(spdlog::default_logger_raw(), __VA_ARGS__)
#else
-#define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0
-#define SPDLOG_CRITICAL(...) (void)0
+# define SPDLOG_LOGGER_CRITICAL(logger, ...) (void)0
+# define SPDLOG_CRITICAL(...) (void)0
#endif
#ifdef SPDLOG_HEADER_ONLY
-#include "spdlog-inl.h"
+# include "spdlog-inl.h"
#endif
#endif // SPDLOG_H