From 4a3d77033d79ea87ba5b0998ca2a0173dc913be0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 9 Oct 2020 08:34:55 +0200 Subject: [PATCH] Move disabling of KDU-specific Clang warning to include_kdu_xxxx.h --- indra/llkdu/include_kdu_xxxx.h | 1 + indra/llkdu/llkdumem.h | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/indra/llkdu/include_kdu_xxxx.h b/indra/llkdu/include_kdu_xxxx.h index 61204b5689..4503d2b751 100644 --- a/indra/llkdu/include_kdu_xxxx.h +++ b/indra/llkdu/include_kdu_xxxx.h @@ -21,6 +21,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wself-assign-field" #pragma clang diagnostic ignored "-Wunused-private-field" +#pragma clang diagnostic ignored "-Woverloaded-virtual" // Silence Clang warning the flag doesn't for some reason #include kdu_xxxx #pragma clang diagnostic pop #elif LL_WINDOWS diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index 80fa695ee7..44757a4bfc 100644 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -27,12 +27,6 @@ #ifndef LL_LLKDUMEM_H #define LL_LLKDUMEM_H -// Silence Clang warning the flag doesn't for some reason -#if __clang__ -#pragma clang diagnostic ignored "-Woverloaded-virtual" -#endif -// - // Support classes for reading and writing from memory buffers in KDU #ifndef LL_WINDOWS #define KDU_NO_THREADS