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

Mark global val_mgr as deprecated and fix uses of it to use namespaced version

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-02 13:08:41 -07:00
parent 3098dd6fbb
commit 86fdf0eaa9
134 changed files with 1579 additions and 1580 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CompHash.cc
View file

@ -764,9 +764,9 @@ const char* CompositeHash::RecoverOneVal(
if ( tag == zeek::TYPE_ENUM )
*pval = t->AsEnumType()->GetVal(*kp);
else if ( tag == zeek::TYPE_BOOL )
*pval = val_mgr->Bool(*kp);
*pval = zeek::val_mgr->Bool(*kp);
else if ( tag == zeek::TYPE_INT )
*pval = val_mgr->Int(*kp);
*pval = zeek::val_mgr->Int(*kp);
else
{
reporter->InternalError("bad internal unsigned int in CompositeHash::RecoverOneVal()");
@ -783,11 +783,11 @@ const char* CompositeHash::RecoverOneVal(
switch ( tag ) {
case zeek::TYPE_COUNT:
case zeek::TYPE_COUNTER:
*pval = val_mgr->Count(*kp);
*pval = zeek::val_mgr->Count(*kp);
break;
case zeek::TYPE_PORT:
*pval = val_mgr->Port(*kp);
*pval = zeek::val_mgr->Port(*kp);
break;
default: