gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue #736

Browse Source
This commit is contained in:
gabime
2018-07-10 20:20:55 +03:00
parent 81f29a9a7a
commit ef111ddba2
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/spdlog/details/pattern_formatter.h
View File

@@ -549,8 +549,8 @@ public:
compile_pattern_(pattern); compile_pattern_(pattern);
} }
pattern_formatter(const pattern_formatter &) = default; pattern_formatter(const pattern_formatter &) = delete;
pattern_formatter &operator=(const pattern_formatter &) = default; pattern_formatter &operator=(const pattern_formatter &) = delete;
void format(const details::log_msg &msg, fmt::memory_buffer &dest) override void format(const details::log_msg &msg, fmt::memory_buffer &dest) override
{ {
#ifndef SPDLOG_NO_DATETIME #ifndef SPDLOG_NO_DATETIME

28
include/spdlog/details/thread_pool.h
View File

@@ -39,8 +39,32 @@ struct async_msg
// should only be moved in or out of the queue.. // should only be moved in or out of the queue..
async_msg(const async_msg &) = delete; async_msg(const async_msg &) = delete;
#if defined(_MSC_VER) && _MSC_VER <= 1800 // support for vs2013 move
async_msg(async_msg &&other) SPDLOG_NOEXCEPT : msg_type(other.msg_type),
level(other.level),
time(other.time),
thread_id(other.thread_id),
raw(move(other.raw)),
msg_id(other.msg_id),
worker_ptr(std::move(other.worker_ptr))
{
}
async_msg &operator=(async_msg &&other) SPDLOG_NOEXCEPT
{
msg_type = other.msg_type;
level = other.level;
time = other.time;
thread_id = other.thread_id;
raw = std::move(other.raw);
msg_id = other.msg_id;
worker_ptr = std::move(other.worker_ptr);
return *this;
}
#else
async_msg(async_msg &&other) = default; async_msg(async_msg &&other) = default;
async_msg &operator=(async_msg &&other) = default; async_msg &operator=(async_msg &&other) = default;
#endif
// construct from log_msg with given type // construct from log_msg with given type
async_msg(async_logger_ptr &&worker, async_msg_type the_type, details::log_msg &&m) async_msg(async_logger_ptr &&worker, async_msg_type the_type, details::log_msg &&m)
@@ -149,7 +173,9 @@ private:
void worker_loop_() void worker_loop_()
{ {
while (process_next_msg_()) {}; while (process_next_msg_())
{
};
} }
// process next message in the queue // process next message in the queue