diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 318218a2..35f9615e 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -14,8 +14,8 @@ #include #include #include -#include #include +#include #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) #include @@ -169,7 +169,6 @@ using filename_t = std::string; err_handler_("Unknown exeption in logger"); \ } - namespace details { // make_unique support for pre c++14 @@ -179,7 +178,7 @@ using std::make_unique; template std::unique_ptr make_unique(Args &&... args) { - static_assert(!std::is_array::value, "arrays to not supported" ); + static_assert(!std::is_array::value, "arrays to not supported"); return std::unique_ptr(new T(std::forward(args)...)); } #endif diff --git a/include/spdlog/sinks/dist_sink.h b/include/spdlog/sinks/dist_sink.h index 721a9abd..bacab872 100644 --- a/include/spdlog/sinks/dist_sink.h +++ b/include/spdlog/sinks/dist_sink.h @@ -67,19 +67,17 @@ protected: } } - void set_pattern_(const std::string &pattern) override { set_formatter_(spdlog::make_unique(pattern)); } - void set_formatter_(std::unique_ptr sink_formatter) override { base_sink::formatter_ = std::move(sink_formatter); for (auto &sink : sinks_) { - sink->set_formatter(base_sink::formatter_ ->clone()); + sink->set_formatter(base_sink::formatter_->clone()); } } std::vector> sinks_;