mirror of
https://github.com/zeek/zeek.git
synced 2025-10-11 19:18:19 +00:00
ZValElement: s to o renaming
s was still from slot naming. o is for other.
This commit is contained in:
parent
907c1a3ee9
commit
a99b6e56af
1 changed files with 7 additions and 7 deletions
14
src/Val.h
14
src/Val.h
|
@ -1166,7 +1166,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Copy constructor.
|
* Copy constructor.
|
||||||
*/
|
*/
|
||||||
ZValElement(const ZValElement& s) : is_set(s.is_set), is_managed(s.is_managed), tag(s.tag), zval(s.zval) {
|
ZValElement(const ZValElement& o) : is_set(o.is_set), is_managed(o.is_managed), tag(o.tag), zval(o.zval) {
|
||||||
if ( is_set && is_managed )
|
if ( is_set && is_managed )
|
||||||
Ref(zval.ManagedVal());
|
Ref(zval.ManagedVal());
|
||||||
}
|
}
|
||||||
|
@ -1180,17 +1180,17 @@ public:
|
||||||
* Assign one ZValElement instance to another with automatic memory management
|
* Assign one ZValElement instance to another with automatic memory management
|
||||||
* based on is_managed.
|
* based on is_managed.
|
||||||
*/
|
*/
|
||||||
ZValElement& operator=(const ZValElement& s) {
|
ZValElement& operator=(const ZValElement& o) {
|
||||||
if ( this == &s )
|
if ( this == &o )
|
||||||
return *this;
|
return *this;
|
||||||
|
|
||||||
if ( is_set && is_managed )
|
if ( is_set && is_managed )
|
||||||
Unref(zval.ManagedVal());
|
Unref(zval.ManagedVal());
|
||||||
|
|
||||||
is_set = s.is_set;
|
is_set = o.is_set;
|
||||||
is_managed = s.is_managed;
|
is_managed = o.is_managed;
|
||||||
tag = s.tag;
|
tag = o.tag;
|
||||||
zval = s.zval;
|
zval = o.zval;
|
||||||
|
|
||||||
if ( is_set && is_managed )
|
if ( is_set && is_managed )
|
||||||
Ref(zval.ManagedVal());
|
Ref(zval.ManagedVal());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue