diff options
| -rw-r--r-- | include/spdlog/details/circular_q.h | 2 | ||||
| -rw-r--r-- | include/spdlog/logger-inl.h | 12 | ||||
| -rw-r--r-- | include/spdlog/spdlog.h | 1 | ||||
| -rw-r--r-- | src/fmt.cpp | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/include/spdlog/details/circular_q.h b/include/spdlog/details/circular_q.h index 709e0c24..c5e3d20b 100644 --- a/include/spdlog/details/circular_q.h +++ b/include/spdlog/details/circular_q.h @@ -89,7 +89,7 @@ public: 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_; diff --git a/include/spdlog/logger-inl.h b/include/spdlog/logger-inl.h index 11cc27ff..c0ace982 100644 --- a/include/spdlog/logger-inl.h +++ b/include/spdlog/logger-inl.h @@ -46,14 +46,14 @@ SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT sinks_.swap(other.sinks_); // swap level_ - auto tmp = other.level_.load(); - tmp = level_.exchange(tmp); - other.level_.store(tmp); + auto other_level = other.level_.load(); + auto my_level = level_.exchange(other_level); + other.level_.store(my_level); // swap flush level_ - tmp = other.flush_level_.load(); - tmp = flush_level_.exchange(tmp); - other.flush_level_.store(tmp); + other_level = other.flush_level_.load(); + my_level = flush_level_.exchange(other_level); + other.flush_level_.store(my_level); custom_err_handler_.swap(other.custom_err_handler_); std::swap(tracer_, other.tracer_); diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index ccedb28b..3638ba12 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -15,7 +15,6 @@ #include "spdlog/version.h" #include "spdlog/details/synchronous_factory.h" - #include <chrono> #include <functional> #include <memory> diff --git a/src/fmt.cpp b/src/fmt.cpp index 046980fa..ed3a78bd 100644 --- a/src/fmt.cpp +++ b/src/fmt.cpp @@ -21,8 +21,8 @@ template FMT_API void internal::buffer<char>::append(const char *, const char *) template FMT_API void internal::arg_map<format_context>::init(const basic_format_args<format_context> &args); template FMT_API std::string internal::vformat<char>(string_view, basic_format_args<format_context>); template FMT_API format_context::iterator internal::vformat_to(internal::buffer<char> &, string_view, basic_format_args<format_context>); -template FMT_API char* internal::sprintf_format(double, internal::buffer<char> &, sprintf_specs); -template FMT_API char* internal::sprintf_format(long double, internal::buffer<char> &, sprintf_specs); +template FMT_API char *internal::sprintf_format(double, internal::buffer<char> &, sprintf_specs); +template FMT_API char *internal::sprintf_format(long double, internal::buffer<char> &, sprintf_specs); // Explicit instantiations for wchar_t. template FMT_API wchar_t internal::thousands_sep_impl(locale_ref); |