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

Completely remove all traces of the COUNTER type.

Browse source 
Relates to GH-1095
This commit is contained in:
Johanna Amann 2020-07-30 12:10:54 -07:00
parent 01fa5611ef
commit 417a6eb1e9
28 changed files with 79 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Val.cc
View file

@ -517,10 +517,6 @@ static void BuildJSON(threading::formatter::JSON::NullDoubleWriter& writer, Val*
writer.Uint64(val->AsCount());
break;
case TYPE_COUNTER:
writer.Uint64(val->AsCounter());
break;
case TYPE_TIME:
writer.Double(val->AsTime());
break;
@ -3449,7 +3445,7 @@ ValPtr check_and_promote(ValPtr v,
t->Error("overflow promoting from signed/double to unsigned arithmetic value", v.get(), false, expr_location);
return nullptr;
}
else if ( t_tag == TYPE_COUNT || t_tag == TYPE_COUNTER )
else if ( t_tag == TYPE_COUNT )
promoted_v = zeek::val_mgr->Count(v->CoerceToUnsigned());
else // port
{