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

Merge remote-tracking branch 'origin/topic/vern/CPP-Oct22-maint'

Browse source 
* origin/topic/vern/CPP-Oct22-maint:
  -O C++ maintenance updates to test suite
  -O gen-C++ maintenance: fixes for attributes & initializing globals
This commit is contained in:
Tim Wojtulewicz 2022-10-17 16:18:55 -07:00
commit 0143d0cb86
18 changed files with 109 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/script_opt/CPP/Driver.cc
View file

@ -311,8 +311,11 @@ void CPPCompile::RegisterCompiledBody(const string& f)
void CPPCompile::GenEpilog()
{
NL();
InitializeGlobals();
if ( standalone )
{
NL();
InitializeGlobals();
}
NL();
for ( const auto& ii : init_infos )
@ -472,8 +475,11 @@ void CPPCompile::GenFinishInit()
NL();
Emit("load_BiFs__CPP();");
NL();
Emit("init_globals__CPP();");
if ( standalone )
{
NL();
Emit("init_globals__CPP();");
}
EndBlock();
}