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

Fix for EnumVal's returning their underlying value

Browse source 
Change EnumVal()->AsEnum() to zeek_int_t.
This commit is contained in:
Vern Paxson 2023-03-08 09:49:59 +01:00 • committed by Arne Welzel
parent 802d24cad7
commit b7f7d32bf7
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Val.h
View file

@ -155,7 +155,7 @@ public:
UNDERLYING_ACCESSOR_DECL(detail::IntValImplementation, zeek_int_t, AsInt)
UNDERLYING_ACCESSOR_DECL(BoolVal, bool, AsBool)
UNDERLYING_ACCESSOR_DECL(EnumVal, int, AsEnum)
UNDERLYING_ACCESSOR_DECL(EnumVal, zeek_int_t, AsEnum)
UNDERLYING_ACCESSOR_DECL(detail::UnsignedValImplementation, zeek_uint_t, AsCount)
UNDERLYING_ACCESSOR_DECL(detail::DoubleValImplementation, double, AsDouble)
UNDERLYING_ACCESSOR_DECL(TimeVal, double, AsTime)
@ -1476,7 +1476,7 @@ protected:
friend class Val;
friend class EnumType;
friend EnumValPtr make_enum__CPP(TypePtr t, int i);
friend EnumValPtr make_enum__CPP(TypePtr t, zeek_int_t i);
template <class T, class... Ts> friend IntrusivePtr<T> make_intrusive(Ts&&... args);
@ -1700,7 +1700,7 @@ private:
UNDERLYING_ACCESSOR_DEF(detail::IntValImplementation, zeek_int_t, AsInt)
UNDERLYING_ACCESSOR_DEF(BoolVal, bool, AsBool)
UNDERLYING_ACCESSOR_DEF(EnumVal, int, AsEnum)
UNDERLYING_ACCESSOR_DEF(EnumVal, zeek_int_t, AsEnum)
UNDERLYING_ACCESSOR_DEF(detail::UnsignedValImplementation, zeek_uint_t, AsCount)
UNDERLYING_ACCESSOR_DEF(detail::DoubleValImplementation, double, AsDouble)
UNDERLYING_ACCESSOR_DEF(TimeVal, double, AsTime)