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 some warnings from bro_version deprecation

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-07-14 17:59:50 +00:00 • committed by Tim Wojtulewicz
parent 33f97fc3fb
commit 0d3d9f67b0
3 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/plugin/Manager.cc
View file

@ -894,20 +894,32 @@ void Manager::HookBroObjDtor(void* obj) const
if ( HavePluginForHook(META_HOOK_PRE) ) if ( HavePluginForHook(META_HOOK_PRE) )
{ {
args.push_back(HookArgument(obj)); args.push_back(HookArgument(obj));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
MetaHookPre(HOOK_BRO_OBJ_DTOR, args); MetaHookPre(HOOK_BRO_OBJ_DTOR, args);
#pragma GCC diagnostic pop
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
hook_list* l = hooks[HOOK_BRO_OBJ_DTOR]; hook_list* l = hooks[HOOK_BRO_OBJ_DTOR];
#pragma GCC diagnostic pop
if ( l ) if ( l )
for ( hook_list::iterator i = l->begin(); i != l->end(); ++i ) for ( hook_list::iterator i = l->begin(); i != l->end(); ++i )
{ {
Plugin* p = (*i).second; Plugin* p = (*i).second;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
p->HookBroObjDtor(obj); p->HookBroObjDtor(obj);
#pragma GCC diagnostic pop
} }
if ( HavePluginForHook(META_HOOK_POST) ) if ( HavePluginForHook(META_HOOK_POST) )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
MetaHookPost(HOOK_BRO_OBJ_DTOR, args, HookArgument()); MetaHookPost(HOOK_BRO_OBJ_DTOR, args, HookArgument());
#pragma GCC diagnostic pop
} }
void Manager::HookObjDtor(void* obj) const void Manager::HookObjDtor(void* obj) const

3
src/plugin/Plugin.cc
View file

@ -383,7 +383,10 @@ void Plugin::RequestEvent(EventHandlerPtr handler)
void Plugin::RequestBroObjDtor(Obj* obj) void Plugin::RequestBroObjDtor(Obj* obj)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
plugin_mgr->RequestBroObjDtor(obj, this); plugin_mgr->RequestBroObjDtor(obj, this);
#pragma GCC diagnostic pop
} }
void Plugin::RequestObjDtor(Obj* obj) void Plugin::RequestObjDtor(Obj* obj)

35
src/plugin/Plugin.h
View file

@ -116,47 +116,46 @@ public:
// We force this to inline so that the API version gets hardcoded // We force this to inline so that the API version gets hardcoded
// into the external plugin. (Technically, it's not a "force", just a // into the external plugin. (Technically, it's not a "force", just a
// strong hint.). The attribute seems generally available. // strong hint.). The attribute seems generally available.
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
inline Configuration() __attribute__((always_inline)) inline Configuration() __attribute__((always_inline))
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
bro_version = ZEEK_PLUGIN_ZEEK_VERSION; bro_version = ZEEK_PLUGIN_ZEEK_VERSION;
#pragma GCC diagnostic pop
zeek_version = ZEEK_PLUGIN_ZEEK_VERSION; zeek_version = ZEEK_PLUGIN_ZEEK_VERSION;
} }
#pragma GCC diagnostic pop
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Configuration(Configuration&& c) Configuration(Configuration&& c)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
bro_version = std::move(c.bro_version); bro_version = std::move(c.bro_version);
#pragma GCC diagnostic pop
zeek_version = std::move(c.zeek_version); zeek_version = std::move(c.zeek_version);
name = std::move(c.name); name = std::move(c.name);
description = std::move(c.description); description = std::move(c.description);
version = std::move(c.version); version = std::move(c.version);
} }
#pragma GCC diagnostic pop
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Configuration(const Configuration& c) Configuration(const Configuration& c)
{ {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
bro_version = c.bro_version; bro_version = c.bro_version;
#pragma GCC diagnostic pop
zeek_version = c.zeek_version; zeek_version = c.zeek_version;
name = c.name; name = c.name;
description = c.description; description = c.description;
version = c.version; version = c.version;
} }
#pragma GCC diagnostic pop
Configuration& operator=(Configuration&& c)
{
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Configuration& operator=(Configuration&& c)
{
bro_version = std::move(c.bro_version); bro_version = std::move(c.bro_version);
#pragma GCC diagnostic pop
zeek_version = std::move(c.zeek_version); zeek_version = std::move(c.zeek_version);
name = std::move(c.name); name = std::move(c.name);
@ -165,13 +164,13 @@ public:
return *this; return *this;
} }
#pragma GCC diagnostic pop
Configuration& operator=(const Configuration& c)
{
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Configuration& operator=(const Configuration& c)
{
bro_version = c.bro_version; bro_version = c.bro_version;
#pragma GCC diagnostic pop
zeek_version = c.zeek_version; zeek_version = c.zeek_version;
name = c.name; name = c.name;
@ -180,6 +179,12 @@ public:
return *this; return *this;
} }
#pragma GCC diagnostic pop
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
~Configuration() { }
#pragma GCC diagnostic pop
/** /**
* One can assign ZEEK_PLUGIN_ZEEK_VERSION to this to catch * One can assign ZEEK_PLUGIN_ZEEK_VERSION to this to catch