From 734af6b6d1179ddbdef89e32a243dacb61da4a68 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 1 Jul 2020 09:57:23 -0700 Subject: [PATCH] Fix a deprecation warning compiling with GCC --- CHANGES | 4 ++++ VERSION | 2 +- src/Type.h | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 9e03d9114f..6eeb951277 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Deprecate plugin::HookType and plugin::component::Type in a different way (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 4847f35897..190c4a7f2d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.827 +3.2.0-dev.828 diff --git a/src/Type.h b/src/Type.h index da3f254aa3..c9ef54cba2 100644 --- a/src/Type.h +++ b/src/Type.h @@ -421,7 +421,12 @@ public: [[deprecated("Remove in v4.1. Use GetIndexTypes().")]] 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>& GetIndexTypes() const { return indices->GetTypes(); }