Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 20:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add move operations for LogWriteHeader

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-28 09:30:18 -07:00
parent df852255c6
commit 6eb49a10cc
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/logging/Types.cc
View file

@ -8,8 +8,6 @@
namespace zeek::logging::detail { namespace zeek::logging::detail {
LogWriteHeader::LogWriteHeader() = default;
LogWriteHeader::LogWriteHeader(EnumValPtr arg_stream_id, EnumValPtr arg_writer_id, std::string arg_filter_name, LogWriteHeader::LogWriteHeader(EnumValPtr arg_stream_id, EnumValPtr arg_writer_id, std::string arg_filter_name,
std::string arg_path) std::string arg_path)
: stream_id(std::move(arg_stream_id)), : stream_id(std::move(arg_stream_id)),
@ -20,10 +18,6 @@ LogWriteHeader::LogWriteHeader(EnumValPtr arg_stream_id, EnumValPtr arg_writer_i
writer_name = obj_desc_short(writer_id.get()); writer_name = obj_desc_short(writer_id.get());
} }
LogWriteHeader& LogWriteHeader::operator=(const LogWriteHeader& other) = default;
LogWriteHeader::~LogWriteHeader() = default;
bool LogWriteHeader::PopulateEnumVals() { bool LogWriteHeader::PopulateEnumVals() {
static const auto& stream_id_type = zeek::id::find_type<zeek::EnumType>("Log::ID"); static const auto& stream_id_type = zeek::id::find_type<zeek::EnumType>("Log::ID");
static const auto& writer_id_type = zeek::id::find_type<zeek::EnumType>("Log::Writer"); static const auto& writer_id_type = zeek::id::find_type<zeek::EnumType>("Log::Writer");

16
src/logging/Types.h
View file

@ -40,7 +40,7 @@ struct LogWriteHeader {
/** /**
* Default constructor. * Default constructor.
*/ */
LogWriteHeader(); LogWriteHeader() = default;
/** /**
* Constructor that populates stream_name and writer_name. * Constructor that populates stream_name and writer_name.
@ -55,12 +55,22 @@ struct LogWriteHeader {
/** /**
* Assignment operator. * Assignment operator.
*/ */
LogWriteHeader& operator=(const LogWriteHeader& other); LogWriteHeader& operator=(const LogWriteHeader& other) = default;
/** /**
* Destructor. * Destructor.
*/ */
~LogWriteHeader(); ~LogWriteHeader() = default;
/**
* Copy constructor.
*/
LogWriteHeader(const LogWriteHeader& other) = default;
/**
* Move constructor.
*/
LogWriteHeader(LogWriteHeader&& other) noexcept = default;
/** /**
* Helper to populate stream_id and writer_id after the * Helper to populate stream_id and writer_id after the