mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-16 00:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
gabime 2018-09-26 23:48:59 +03:00
parent e8dae26176
commit 669a66f18a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/spdlog/common.h
View File

@ -14,8 +14,8 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <unordered_map>
#include <type_traits> #include <type_traits>
#include <unordered_map>
#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
#include <codecvt> #include <codecvt>
@ -169,7 +169,6 @@ using filename_t = std::string;
err_handler_("Unknown exeption in logger"); \ err_handler_("Unknown exeption in logger"); \
} }
namespace details { namespace details {
// make_unique support for pre c++14 // make_unique support for pre c++14
@ -179,7 +178,7 @@ using std::make_unique;
template<typename T, typename... Args> template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args &&... args) std::unique_ptr<T> make_unique(Args &&... args)
{ {
static_assert(!std::is_array<T>::value, "arrays to not supported" ); static_assert(!std::is_array<T>::value, "arrays to not supported");
return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
} }
#endif #endif

4
include/spdlog/sinks/dist_sink.h
View File

@ -67,19 +67,17 @@ protected:
} }
} }
void set_pattern_(const std::string &pattern) override void set_pattern_(const std::string &pattern) override
{ {
set_formatter_(spdlog::make_unique<spdlog::pattern_formatter>(pattern)); set_formatter_(spdlog::make_unique<spdlog::pattern_formatter>(pattern));
} }
void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override
{ {
base_sink<Mutex>::formatter_ = std::move(sink_formatter); base_sink<Mutex>::formatter_ = std::move(sink_formatter);
for (auto &sink : sinks_) for (auto &sink : sinks_)
{ {
sink->set_formatter(base_sink<Mutex>::formatter_ ->clone()); sink->set_formatter(base_sink<Mutex>::formatter_->clone());
} }
} }
std::vector<std::shared_ptr<sink>> sinks_; std::vector<std::shared_ptr<sink>> sinks_;