1
0
mirror of https://github.com/gabime/spdlog.git synced 2025-04-01 02:42:41 +08:00
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

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

View File

@ -67,13 +67,11 @@ 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);