From 7604996aad019eae8c09e01e04ed3bc2c3318801 Mon Sep 17 00:00:00 2001 From: Varun Mathur Date: Tue, 6 Feb 2024 11:22:29 -0800 Subject: [PATCH] revert spdlog changes --- src/3rd_party/spdlog/async_logger.h | 6 +++--- src/3rd_party/spdlog/common.h | 2 +- src/3rd_party/spdlog/details/async_log_helper.h | 12 ++++++------ src/3rd_party/spdlog/details/async_logger_impl.h | 4 ++-- src/3rd_party/spdlog/details/file_helper.h | 4 ++-- src/3rd_party/spdlog/details/line_logger_fwd.h | 4 ++-- src/3rd_party/spdlog/details/line_logger_impl.h | 6 +++--- src/3rd_party/spdlog/details/log_msg.h | 4 ++-- src/3rd_party/spdlog/details/logger_impl.h | 2 +- src/3rd_party/spdlog/details/mpmc_bounded_q.h | 2 +- src/3rd_party/spdlog/details/os.h | 2 +- .../spdlog/details/pattern_formatter_impl.h | 8 ++++---- src/3rd_party/spdlog/details/registry.h | 8 ++++---- src/3rd_party/spdlog/details/spdlog_impl.h | 12 ++++++------ src/3rd_party/spdlog/formatter.h | 4 ++-- src/3rd_party/spdlog/logger.h | 10 +++++----- src/3rd_party/spdlog/sinks/android_sink.h | 4 ++-- src/3rd_party/spdlog/sinks/ansicolor_sink.h | 4 ++-- src/3rd_party/spdlog/sinks/base_sink.h | 8 ++++---- src/3rd_party/spdlog/sinks/dist_sink.h | 8 ++++---- src/3rd_party/spdlog/sinks/file_sinks.h | 8 ++++---- src/3rd_party/spdlog/sinks/msvc_sink.h | 4 ++-- src/3rd_party/spdlog/sinks/null_sink.h | 4 ++-- src/3rd_party/spdlog/sinks/ostream_sink.h | 4 ++-- src/3rd_party/spdlog/sinks/sink.h | 2 +- src/3rd_party/spdlog/sinks/stdout_sinks.h | 2 +- src/3rd_party/spdlog/sinks/syslog_sink.h | 6 +++--- src/3rd_party/spdlog/spdlog.h | 8 ++++---- 28 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/3rd_party/spdlog/async_logger.h b/src/3rd_party/spdlog/async_logger.h index e6d75fef0..21075614d 100644 --- a/src/3rd_party/spdlog/async_logger.h +++ b/src/3rd_party/spdlog/async_logger.h @@ -15,8 +15,8 @@ // 3. will throw spdlog_ex upon log exceptions // Upong destruction, logs all remaining messages in the queue before destructing.. -#include "spdlog/common.h" -#include "spdlog/logger.h" +#include +#include #include #include @@ -70,5 +70,5 @@ class async_logger :public logger } -#include "spdlog/details/async_logger_impl.h" +#include diff --git a/src/3rd_party/spdlog/common.h b/src/3rd_party/spdlog/common.h index cc1db3eeb..556692787 100644 --- a/src/3rd_party/spdlog/common.h +++ b/src/3rd_party/spdlog/common.h @@ -17,7 +17,7 @@ #include #endif -#include "spdlog/details/null_mutex.h" +#include //visual studio does not support noexcept yet #ifndef _MSC_VER diff --git a/src/3rd_party/spdlog/details/async_log_helper.h b/src/3rd_party/spdlog/details/async_log_helper.h index 48090d697..c14365f93 100644 --- a/src/3rd_party/spdlog/details/async_log_helper.h +++ b/src/3rd_party/spdlog/details/async_log_helper.h @@ -14,12 +14,12 @@ #pragma once -#include "spdlog/common.h" -#include "spdlog/sinks/sink.h" -#include "spdlog/details/mpmc_bounded_q.h" -#include "spdlog/details/log_msg.h" -#include "spdlog/details/os.h" -#include "spdlog/formatter.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/async_logger_impl.h b/src/3rd_party/spdlog/details/async_logger_impl.h index 9d1ca8455..140d45f48 100644 --- a/src/3rd_party/spdlog/details/async_logger_impl.h +++ b/src/3rd_party/spdlog/details/async_logger_impl.h @@ -8,8 +8,8 @@ // Async Logger implementation // Use an async_sink (queue per logger) to perform the logging in a worker thread -#include "spdlog/details/async_log_helper.h" -#include "spdlog/async_logger.h" +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/file_helper.h b/src/3rd_party/spdlog/details/file_helper.h index c879a2efc..024a21b55 100644 --- a/src/3rd_party/spdlog/details/file_helper.h +++ b/src/3rd_party/spdlog/details/file_helper.h @@ -10,8 +10,8 @@ // Can be set to auto flush on every line // Throw spdlog_ex exception on errors -#include "spdlog/details/os.h" -#include "spdlog/details/log_msg.h" +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/line_logger_fwd.h b/src/3rd_party/spdlog/details/line_logger_fwd.h index ad2d7445b..a8bc58ff5 100644 --- a/src/3rd_party/spdlog/details/line_logger_fwd.h +++ b/src/3rd_party/spdlog/details/line_logger_fwd.h @@ -4,8 +4,8 @@ // #pragma once -#include "spdlog/common.h" -#include "spdlog/details/log_msg.h" +#include +#include #include diff --git a/src/3rd_party/spdlog/details/line_logger_impl.h b/src/3rd_party/spdlog/details/line_logger_impl.h index c1ee3f094..d61225afb 100644 --- a/src/3rd_party/spdlog/details/line_logger_impl.h +++ b/src/3rd_party/spdlog/details/line_logger_impl.h @@ -5,9 +5,9 @@ #pragma once #include -#include "spdlog/details/line_logger_fwd.h" -#include "spdlog/common.h" -#include "spdlog/logger.h" +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/log_msg.h b/src/3rd_party/spdlog/details/log_msg.h index 96c3b2811..0d50b6848 100644 --- a/src/3rd_party/spdlog/details/log_msg.h +++ b/src/3rd_party/spdlog/details/log_msg.h @@ -5,8 +5,8 @@ #pragma once -#include "spdlog/common.h" -#include "spdlog/details/format.h" +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/logger_impl.h b/src/3rd_party/spdlog/details/logger_impl.h index 9f5e5cf2d..428cd1896 100644 --- a/src/3rd_party/spdlog/details/logger_impl.h +++ b/src/3rd_party/spdlog/details/logger_impl.h @@ -5,7 +5,7 @@ #pragma once -#include "spdlog/logger.h" +#include #include #include diff --git a/src/3rd_party/spdlog/details/mpmc_bounded_q.h b/src/3rd_party/spdlog/details/mpmc_bounded_q.h index 83afd6086..ad14d6f25 100644 --- a/src/3rd_party/spdlog/details/mpmc_bounded_q.h +++ b/src/3rd_party/spdlog/details/mpmc_bounded_q.h @@ -43,7 +43,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT) #pragma once -#include "spdlog/common.h" +#include #include #include diff --git a/src/3rd_party/spdlog/details/os.h b/src/3rd_party/spdlog/details/os.h index 004368e36..f4720648a 100644 --- a/src/3rd_party/spdlog/details/os.h +++ b/src/3rd_party/spdlog/details/os.h @@ -4,7 +4,7 @@ // #pragma once -#include "spdlog/common.h" +#include #include #include diff --git a/src/3rd_party/spdlog/details/pattern_formatter_impl.h b/src/3rd_party/spdlog/details/pattern_formatter_impl.h index b7afcb383..3965b831f 100644 --- a/src/3rd_party/spdlog/details/pattern_formatter_impl.h +++ b/src/3rd_party/spdlog/details/pattern_formatter_impl.h @@ -5,10 +5,10 @@ #pragma once -#include "spdlog/formatter.h" -#include "spdlog/details/log_msg.h" -#include "spdlog/details/os.h" -#include "spdlog/details/format.h" +#include +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/registry.h b/src/3rd_party/spdlog/details/registry.h index 35e91cafb..0a35451c3 100644 --- a/src/3rd_party/spdlog/details/registry.h +++ b/src/3rd_party/spdlog/details/registry.h @@ -10,10 +10,10 @@ // If user requests a non existing logger, nullptr will be returned // This class is thread safe -#include "spdlog/details/null_mutex.h" -#include "spdlog/logger.h" -#include "spdlog/async_logger.h" -#include "spdlog/common.h" +#include +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/details/spdlog_impl.h b/src/3rd_party/spdlog/details/spdlog_impl.h index c359cc481..3942e5a70 100644 --- a/src/3rd_party/spdlog/details/spdlog_impl.h +++ b/src/3rd_party/spdlog/details/spdlog_impl.h @@ -8,12 +8,12 @@ // // Global registry functions // -#include "spdlog/spdlog.h" -#include "spdlog/details/registry.h" -#include "spdlog/sinks/file_sinks.h" -#include "spdlog/sinks/stdout_sinks.h" -#include "spdlog/sinks/syslog_sink.h" -#include "spdlog/sinks/ansicolor_sink.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/formatter.h b/src/3rd_party/spdlog/formatter.h index 89fc03300..0ffcec03e 100644 --- a/src/3rd_party/spdlog/formatter.h +++ b/src/3rd_party/spdlog/formatter.h @@ -5,7 +5,7 @@ #pragma once -#include "spdlog/details/log_msg.h" +#include #include #include @@ -41,5 +41,5 @@ class pattern_formatter : public formatter }; } -#include "spdlog/details/pattern_formatter_impl.h" +#include diff --git a/src/3rd_party/spdlog/logger.h b/src/3rd_party/spdlog/logger.h index 8e9aeb8d0..41d51fbf8 100644 --- a/src/3rd_party/spdlog/logger.h +++ b/src/3rd_party/spdlog/logger.h @@ -12,9 +12,9 @@ // 2. Format the message using the formatter function // 3. Pass the formatted message to its sinks to performa the actual logging -#include "spdlog/sinks/base_sink.h" -#include "spdlog/common.h" -#include "spdlog/details/line_logger_fwd.h" +#include +#include +#include #include #include @@ -107,6 +107,6 @@ class logger }; } -#include "spdlog/details/logger_impl.h" -#include "spdlog/details/line_logger_impl.h" +#include +#include diff --git a/src/3rd_party/spdlog/sinks/android_sink.h b/src/3rd_party/spdlog/sinks/android_sink.h index 1e2ba7cf0..885f78da7 100644 --- a/src/3rd_party/spdlog/sinks/android_sink.h +++ b/src/3rd_party/spdlog/sinks/android_sink.h @@ -7,8 +7,8 @@ #if defined(__ANDROID__) -#include "spdlog/sinks/base_sink.h" -#include "spdlog/details/null_mutex.h" +#include +#include #include diff --git a/src/3rd_party/spdlog/sinks/ansicolor_sink.h b/src/3rd_party/spdlog/sinks/ansicolor_sink.h index 08e40c70c..664b25992 100644 --- a/src/3rd_party/spdlog/sinks/ansicolor_sink.h +++ b/src/3rd_party/spdlog/sinks/ansicolor_sink.h @@ -5,8 +5,8 @@ #pragma once -#include "spdlog/sinks/base_sink.h" -#include "spdlog/common.h" +#include +#include #include #include diff --git a/src/3rd_party/spdlog/sinks/base_sink.h b/src/3rd_party/spdlog/sinks/base_sink.h index 68c1306d7..615bb6f0c 100644 --- a/src/3rd_party/spdlog/sinks/base_sink.h +++ b/src/3rd_party/spdlog/sinks/base_sink.h @@ -10,10 +10,10 @@ // all locking is taken care of here so no locking needed by the implementors.. // -#include "spdlog/sinks/sink.h" -#include "spdlog/formatter.h" -#include "spdlog/common.h" -#include "spdlog/details/log_msg.h" +#include +#include +#include +#include #include diff --git a/src/3rd_party/spdlog/sinks/dist_sink.h b/src/3rd_party/spdlog/sinks/dist_sink.h index b957f47af..0e7cfc1e9 100644 --- a/src/3rd_party/spdlog/sinks/dist_sink.h +++ b/src/3rd_party/spdlog/sinks/dist_sink.h @@ -5,10 +5,10 @@ #pragma once -#include "spdlog/details/log_msg.h" -#include "spdlog/details/null_mutex.h" -#include "spdlog/sinks/base_sink.h" -#include "spdlog/sinks/sink.h" +#include +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/sinks/file_sinks.h b/src/3rd_party/spdlog/sinks/file_sinks.h index e64b2361c..e28572709 100644 --- a/src/3rd_party/spdlog/sinks/file_sinks.h +++ b/src/3rd_party/spdlog/sinks/file_sinks.h @@ -5,10 +5,10 @@ #pragma once -#include "spdlog/sinks/base_sink.h" -#include "spdlog/details/null_mutex.h" -#include "spdlog/details/file_helper.h" -#include "spdlog/details/format.h" +#include +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/sinks/msvc_sink.h b/src/3rd_party/spdlog/sinks/msvc_sink.h index 5382cd3e4..16342ca26 100644 --- a/src/3rd_party/spdlog/sinks/msvc_sink.h +++ b/src/3rd_party/spdlog/sinks/msvc_sink.h @@ -7,8 +7,8 @@ #if defined(_MSC_VER) -#include "spdlog/sinks/base_sink.h" -#include "spdlog/details/null_mutex.h" +#include +#include #include diff --git a/src/3rd_party/spdlog/sinks/null_sink.h b/src/3rd_party/spdlog/sinks/null_sink.h index e6a656053..68bd9c94d 100644 --- a/src/3rd_party/spdlog/sinks/null_sink.h +++ b/src/3rd_party/spdlog/sinks/null_sink.h @@ -5,8 +5,8 @@ #pragma once -#include "spdlog/sinks/base_sink.h" -#include "spdlog/details/null_mutex.h" +#include +#include #include diff --git a/src/3rd_party/spdlog/sinks/ostream_sink.h b/src/3rd_party/spdlog/sinks/ostream_sink.h index 51459c10a..feb5efa18 100644 --- a/src/3rd_party/spdlog/sinks/ostream_sink.h +++ b/src/3rd_party/spdlog/sinks/ostream_sink.h @@ -5,8 +5,8 @@ #pragma once -#include "spdlog/details/null_mutex.h" -#include "spdlog/sinks/base_sink.h" +#include +#include #include #include diff --git a/src/3rd_party/spdlog/sinks/sink.h b/src/3rd_party/spdlog/sinks/sink.h index a24c78fca..39dc771ad 100644 --- a/src/3rd_party/spdlog/sinks/sink.h +++ b/src/3rd_party/spdlog/sinks/sink.h @@ -6,7 +6,7 @@ #pragma once -#include "spdlog/details/log_msg.h" +#include namespace spdlog { diff --git a/src/3rd_party/spdlog/sinks/stdout_sinks.h b/src/3rd_party/spdlog/sinks/stdout_sinks.h index 380539f21..ca4c55ac8 100644 --- a/src/3rd_party/spdlog/sinks/stdout_sinks.h +++ b/src/3rd_party/spdlog/sinks/stdout_sinks.h @@ -5,7 +5,7 @@ #pragma once -#include "spdlog/details/null_mutex.h" +#include #include #include diff --git a/src/3rd_party/spdlog/sinks/syslog_sink.h b/src/3rd_party/spdlog/sinks/syslog_sink.h index eb88d4bff..5d7ccf871 100644 --- a/src/3rd_party/spdlog/sinks/syslog_sink.h +++ b/src/3rd_party/spdlog/sinks/syslog_sink.h @@ -7,9 +7,9 @@ #if defined(__linux__) || defined(__APPLE__) -#include "spdlog/sinks/sink.h" -#include "spdlog/common.h" -#include "spdlog/details/log_msg.h" +#include +#include +#include #include #include diff --git a/src/3rd_party/spdlog/spdlog.h b/src/3rd_party/spdlog/spdlog.h index 6f3ea02fc..2fd5e4b8f 100644 --- a/src/3rd_party/spdlog/spdlog.h +++ b/src/3rd_party/spdlog/spdlog.h @@ -8,9 +8,9 @@ #pragma once -#include "spdlog/tweakme.h" -#include "spdlog/common.h" -#include "spdlog/logger.h" +#include +#include +#include #include #include @@ -136,4 +136,4 @@ void drop_all(); } -#include "spdlog/details/spdlog_impl.h" +#include