mirror of
https://github.com/gabime/spdlog.git
synced 2025-09-30 10:29:02 +08:00
clang format
This commit is contained in:
@@ -18,14 +18,13 @@
|
||||
#include <cstdint>
|
||||
#include <version>
|
||||
|
||||
# if __cpp_lib_source_location >= 201907
|
||||
# include <source_location>
|
||||
# define SPDLOG_STD_SOURCE_LOCATION
|
||||
# elif __has_include(<experimental/source_location>)
|
||||
# include <experimental/source_location>
|
||||
# define SPDLOG_EXPERIMENTAL_SOURCE_LOCATION
|
||||
# endif
|
||||
|
||||
#if __cpp_lib_source_location >= 201907
|
||||
# include <source_location>
|
||||
# define SPDLOG_STD_SOURCE_LOCATION
|
||||
#elif __has_include(<experimental/source_location>)
|
||||
# include <experimental/source_location>
|
||||
# define SPDLOG_EXPERIMENTAL_SOURCE_LOCATION
|
||||
#endif
|
||||
|
||||
#ifdef SPDLOG_USE_STD_FORMAT
|
||||
# if __cpp_lib_format >= 202207L
|
||||
@@ -67,7 +66,6 @@
|
||||
# define SPDLOG_FMT_STRING(format_string) format_string
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef SPDLOG_FUNCTION
|
||||
# define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
|
||||
#endif
|
||||
@@ -124,7 +122,6 @@ using format_string_t = std::format_string<Args...>;
|
||||
using format_string_t = std::string_view;
|
||||
# endif
|
||||
|
||||
|
||||
# define SPDLOG_BUF_TO_STRING(x) x
|
||||
#else // use fmt lib instead of std::format
|
||||
namespace fmt_lib = fmt;
|
||||
@@ -164,7 +161,7 @@ using level_t = std::atomic<int>;
|
||||
#endif
|
||||
|
||||
// Is convertable to string_view_t ?
|
||||
template <typename T>
|
||||
template<typename T>
|
||||
using is_convertible_to_sv = std::enable_if_t<std::is_convertible_v<T, string_view_t>>;
|
||||
|
||||
// Log level enum
|
||||
@@ -248,7 +245,6 @@ 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
|
||||
{
|
||||
constexpr source_loc() = default;
|
||||
@@ -264,14 +260,15 @@ struct source_loc
|
||||
return source_loc{source_location.file_name(), source_location.line(), source_location.function_name()};
|
||||
}
|
||||
#elif defined(SPDLOG_EXPERIMENTAL_SOURCE_LOCATION)
|
||||
static constexpr source_loc current(const std::experimental::source_location source_location = std::experimental::source_location::current())
|
||||
static constexpr source_loc current(
|
||||
const std::experimental::source_location source_location = std::experimental::source_location::current())
|
||||
{
|
||||
return source_loc{source_location.file_name(), source_location.line(), source_location.function_name()};
|
||||
}
|
||||
#else // no source location support
|
||||
static constexpr source_loc current()
|
||||
{
|
||||
return source_loc{};
|
||||
return source_loc{};
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -290,8 +287,10 @@ struct loc_with_fmt
|
||||
source_loc loc;
|
||||
string_view_t fmt_string;
|
||||
template<typename S, typename = is_convertible_to_sv<S>>
|
||||
constexpr loc_with_fmt(S fmt_str, source_loc loc = source_loc::current()) noexcept:
|
||||
loc(loc), fmt_string(fmt_str) {}
|
||||
constexpr loc_with_fmt(S fmt_str, source_loc loc = source_loc::current()) noexcept
|
||||
: loc(loc)
|
||||
, fmt_string(fmt_str)
|
||||
{}
|
||||
};
|
||||
|
||||
struct file_event_handlers
|
||||
@@ -349,7 +348,6 @@ constexpr std::basic_string_view<T> to_string_view(std::basic_format_string<T, A
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
} // namespace details
|
||||
} // namespace spdlog
|
||||
|
||||
|
@@ -100,7 +100,7 @@ public:
|
||||
// Pop item from front if not empty.
|
||||
void pop_front()
|
||||
{
|
||||
if(!empty())
|
||||
if (!empty())
|
||||
{
|
||||
head_ = (head_ + 1) % max_items_;
|
||||
}
|
||||
|
@@ -26,7 +26,9 @@ 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) noexcept : log_msg{other}, buffer{std::move(other.buffer)}
|
||||
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) noexcept
|
||||
: log_msg{other}
|
||||
, buffer{std::move(other.buffer)}
|
||||
{
|
||||
update_string_views();
|
||||
}
|
||||
|
@@ -23,11 +23,12 @@ SPDLOG_INLINE logger::logger(const logger &other) noexcept
|
||||
, custom_err_handler_(other.custom_err_handler_)
|
||||
{}
|
||||
|
||||
SPDLOG_INLINE logger::logger(logger &&other) noexcept : name_(std::move(other.name_)),
|
||||
sinks_(std::move(other.sinks_)),
|
||||
level_(other.level_.load(std::memory_order_relaxed)),
|
||||
flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
|
||||
custom_err_handler_(std::move(other.custom_err_handler_))
|
||||
SPDLOG_INLINE logger::logger(logger &&other) noexcept
|
||||
: name_(std::move(other.name_))
|
||||
, sinks_(std::move(other.sinks_))
|
||||
, level_(other.level_.load(std::memory_order_relaxed))
|
||||
, flush_level_(other.flush_level_.load(std::memory_order_relaxed))
|
||||
, custom_err_handler_(std::move(other.custom_err_handler_))
|
||||
|
||||
{}
|
||||
|
||||
|
@@ -93,9 +93,7 @@ public:
|
||||
log(source_loc{}, lvl, fmt, std::forward<Args>(args)...);
|
||||
}
|
||||
|
||||
template<typename S,
|
||||
typename = is_convertible_to_sv<S>,
|
||||
typename... Args>
|
||||
template<typename S, typename = is_convertible_to_sv<S>, typename... Args>
|
||||
void log(source_loc loc, level::level_enum lvl, S fmt, Args &&...args)
|
||||
{
|
||||
if (should_log(lvl))
|
||||
@@ -105,8 +103,7 @@ public:
|
||||
}
|
||||
|
||||
// log with no format string, just string message
|
||||
template<typename S,
|
||||
typename = is_convertible_to_sv<S>>
|
||||
template<typename S, typename = is_convertible_to_sv<S>>
|
||||
void log(source_loc loc, level::level_enum lvl, S msg)
|
||||
{
|
||||
if (should_log(lvl))
|
||||
@@ -282,7 +279,6 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// return true logging is enabled for the given level.
|
||||
[[nodiscard]] bool should_log(level::level_enum msg_level) const
|
||||
{
|
||||
@@ -352,7 +348,7 @@ protected:
|
||||
// log the given message (if the given log level is high enough)
|
||||
virtual void sink_it_(const details::log_msg &msg)
|
||||
{
|
||||
assert (should_log(msg.level));
|
||||
assert(should_log(msg.level));
|
||||
for (auto &sink : sinks_)
|
||||
{
|
||||
if (sink->should_log(msg.level))
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
: q_{n_items}
|
||||
{}
|
||||
|
||||
void drain_raw(std::function<void(const details::log_msg_buffer&)> callback)
|
||||
void drain_raw(std::function<void(const details::log_msg_buffer &)> callback)
|
||||
{
|
||||
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
|
||||
while (!q_.empty())
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
{
|
||||
formatted.clear();
|
||||
base_sink<Mutex>::formatter_->format(q_.front(), formatted);
|
||||
callback(std::string_view (formatted.data(), formatted.size()));
|
||||
callback(std::string_view(formatted.data(), formatted.size()));
|
||||
q_.pop_front();
|
||||
}
|
||||
}
|
||||
|
@@ -51,7 +51,9 @@ struct local_alloc_t
|
||||
{
|
||||
HLOCAL hlocal_;
|
||||
|
||||
constexpr local_alloc_t() noexcept : hlocal_(nullptr) {}
|
||||
constexpr local_alloc_t() noexcept
|
||||
: hlocal_(nullptr)
|
||||
{}
|
||||
|
||||
local_alloc_t(local_alloc_t const &) = delete;
|
||||
local_alloc_t &operator=(local_alloc_t const &) = delete;
|
||||
|
@@ -122,8 +122,6 @@ SPDLOG_API spdlog::logger *default_logger_raw();
|
||||
|
||||
SPDLOG_API void set_default_logger(std::shared_ptr<spdlog::logger> default_logger);
|
||||
|
||||
|
||||
|
||||
// Initialize logger level based on environment configs.
|
||||
//
|
||||
// Useful for applying SPDLOG_LEVEL to manually created loggers.
|
||||
|
Reference in New Issue
Block a user