Commit 433785dc authored by gabime's avatar gabime

fix warnings and build

parent 28845b96
...@@ -63,7 +63,7 @@ namespace spdlog { ...@@ -63,7 +63,7 @@ namespace spdlog {
return enabled_.load(std::memory_order_relaxed); return enabled_.load(std::memory_order_relaxed);
} }
operator bool() const explicit operator bool() const
{ {
return enabled(); return enabled();
} }
......
...@@ -35,7 +35,7 @@ namespace spdlog { ...@@ -35,7 +35,7 @@ namespace spdlog {
// move cannot be default, // move cannot be default,
// since we need to reset head_, tail_, etc to zero in the moved object // since we need to reset head_, tail_, etc to zero in the moved object
circular_q(circular_q&& other) SPDLOG_NOEXCEPT: circular_q(circular_q&& other) SPDLOG_NOEXCEPT
{ {
copy_moveable(std::move(other)); copy_moveable(std::move(other));
} }
......
...@@ -47,10 +47,10 @@ public: ...@@ -47,10 +47,10 @@ public:
update_string_views(); update_string_views();
} }
log_msg_buffer &operator=(log_msg_buffer &other) log_msg_buffer &operator=(const log_msg_buffer &other)
{ {
log_msg::operator=(other); log_msg::operator=(other);
buffer.append(other.buffer.begin(), other.buffer.end()); buffer.append(other.buffer.data(), other.buffer.data() + other.buffer.size());
update_string_views(); update_string_views();
return *this; return *this;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment