more cleanup of unneeded code, needed to revert cmake standard to get this to work

pull/2595/head
Bailey Chittle 3 years ago
parent 301ab18822
commit 07abdc6453

@ -26,7 +26,7 @@ endif()
# Compiler config # Compiler config
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
if(NOT CMAKE_CXX_STANDARD) if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif() endif()

@ -12,7 +12,6 @@ namespace details {
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg &orig_msg) SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg &orig_msg)
: log_msg{orig_msg} : log_msg{orig_msg}
, attributes{orig_msg.attributes}
{ {
buffer.append(logger_name.begin(), logger_name.end()); buffer.append(logger_name.begin(), logger_name.end());
buffer.append(payload.begin(), payload.end()); buffer.append(payload.begin(), payload.end());
@ -21,7 +20,6 @@ SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg &orig_msg)
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other) SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
: log_msg{other} : log_msg{other}
, attributes{other.attributes}
{ {
buffer.append(logger_name.begin(), logger_name.end()); buffer.append(logger_name.begin(), logger_name.end());
buffer.append(payload.begin(), payload.end()); buffer.append(payload.begin(), payload.end());
@ -29,7 +27,7 @@ SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
} }
SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT
: log_msg{other}, buffer{std::move(other.buffer)}, attributes{std::move(other.attributes)} : log_msg{other}, buffer{std::move(other.buffer)}
{ {
update_string_views(); update_string_views();
} }
@ -47,7 +45,6 @@ SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other)
{ {
log_msg::operator=(other); log_msg::operator=(other);
buffer = std::move(other.buffer); buffer = std::move(other.buffer);
attributes = std::move(other.attributes);
update_string_views(); update_string_views();
return *this; return *this;
} }

@ -14,7 +14,6 @@ namespace details {
class SPDLOG_API log_msg_buffer : public log_msg class SPDLOG_API log_msg_buffer : public log_msg
{ {
memory_buf_t buffer; memory_buf_t buffer;
std::vector<attr> attributes;
void update_string_views(); void update_string_views();
public: public:

Loading…
Cancel
Save