From d6d1a1fc21084c81a0795a26e67577c2a718f6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 9 Nov 2021 08:23:25 +0200 Subject: [PATCH] Remove a warning for clang 11 or earlier This fixes up commit d22c8cae00f7a7517c9b8228efbb543037c23c97 --- storage/innobase/pars/pars0grm.cc | 2 +- storage/innobase/pars/pars0grm.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/pars/pars0grm.cc b/storage/innobase/pars/pars0grm.cc index 10d0d0becd7..1e10a61f5ad 100644 --- a/storage/innobase/pars/pars0grm.cc +++ b/storage/innobase/pars/pars0grm.cc @@ -79,7 +79,7 @@ que_node_t */ #include "que0que.h" #include "row0sel.h" -#ifdef __GNUC__ +#if defined __GNUC__ && (!defined __clang_major__ || __clang_major__ > 11) #pragma GCC diagnostic ignored "-Wfree-nonheap-object" #endif diff --git a/storage/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y index 3fb0865f608..ed2b9bc09b0 100644 --- a/storage/innobase/pars/pars0grm.y +++ b/storage/innobase/pars/pars0grm.y @@ -38,7 +38,7 @@ que_node_t */ #include "que0que.h" #include "row0sel.h" -#ifdef __GNUC__ +#if defined __GNUC__ && (!defined __clang_major__ || __clang_major__ > 11) #pragma GCC diagnostic ignored "-Wfree-nonheap-object" #endif