Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 17:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/johanna/gh-859

Browse source
This commit is contained in:
Johanna Amann 2021-06-30 10:36:54 +01:00
commit 509b501e1b
18 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Val.h
View file

@ -1183,22 +1183,6 @@ public:
Assign(idx, std::forward<T>(val));
}
/**
* Appends a value to the record's fields. The caller is responsible
* for ensuring that fields are appended in the correct order and
* with the correct type. The type needs to be passed in because
* it's unsafe to take it from v when the field's type is "any" while
* v is a concrete type.
* @param v The value to append.
*/
void AppendField(ValPtr v, const TypePtr& t)
{
if ( v )
record_val->emplace_back(ZVal(v, t));
else
record_val->emplace_back(std::nullopt);
}
/**
* Returns the number of fields in the record.
* @return The number of fields in the record.
@ -1423,6 +1407,23 @@ public:
protected:
friend class zeek::detail::ZBody;
/**
* Appends a value to the record's fields. The caller is responsible
* for ensuring that fields are appended in the correct order and
* with the correct type. The type needs to be passed in because
* it's unsafe to take it from v when the field's type is "any" while
* v is a concrete type.
* @param v The value to append.
* @param t The type associated with the field.
*/
void AppendField(ValPtr v, const TypePtr& t)
{
if ( v )
record_val->emplace_back(ZVal(v, t));
else
record_val->emplace_back(std::nullopt);
}
// For use by low-level ZAM instructions. Caller assumes
// responsibility for memory management. The first version
// allows manipulation of whether the field is present at all.