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

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

View file

@ -308,7 +308,7 @@ void terminate_bro()
delete log_mgr;
delete reporter;
delete plugin_mgr;
delete val_mgr;
delete zeek::val_mgr;
// free the global scope
zeek::detail::pop_scope();
@ -465,7 +465,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
bro_start_time = current_time(true);
val_mgr = new ValManager();
zeek::val_mgr = new ValManager();
reporter = new Reporter(options.abort_on_scripting_errors);
thread_mgr = new threading::Manager();
plugin_mgr = new zeek::plugin::Manager();
@ -845,7 +845,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
mgr.Enqueue(zeek_script_loaded,
zeek::make_intrusive<zeek::StringVal>(i->name.c_str()),
val_mgr->Count(i->include_level));
zeek::val_mgr->Count(i->include_level));
}
}