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

Fix a deprecation warning compiling with GCC

Browse source
This commit is contained in:
Jon Siwek 2020-07-01 09:57:23 -07:00
parent 4668378d91
commit 734af6b6d1
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.2.0-dev.828 | 2020-07-01 09:57:23 -0700
* Fix a deprecation warning compiling with GCC (Jon Siwek, Corelight)
3.2.0-dev.827 | 2020-06-30 16:54:22 -0700 3.2.0-dev.827 | 2020-06-30 16:54:22 -0700
* Deprecate plugin::HookType and plugin::component::Type in a different way (Tim Wojtulewicz, Corelight) * Deprecate plugin::HookType and plugin::component::Type in a different way (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.827 3.2.0-dev.828

7
src/Type.h
View file

@ -421,7 +421,12 @@ public:
[[deprecated("Remove in v4.1. Use GetIndexTypes().")]] [[deprecated("Remove in v4.1. Use GetIndexTypes().")]]
const type_list* IndexTypes() const const type_list* IndexTypes() const
{ return indices->Types(); } {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return indices->Types();
#pragma GCC diagnostic pop
}
const std::vector<IntrusivePtr<Type>>& GetIndexTypes() const const std::vector<IntrusivePtr<Type>>& GetIndexTypes() const
{ return indices->GetTypes(); } { return indices->GetTypes(); }