From 9cbba0ae01f62e93f89361cd61ba309e6ca15e94 Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Thu, 5 Apr 2018 14:46:28 -0500 Subject: [PATCH] Hide warnings about non-virtual destructors from df-structures. --- library/include/DataDefs.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h index ed37a91fc..e72a893e5 100644 --- a/library/include/DataDefs.h +++ b/library/include/DataDefs.h @@ -423,12 +423,15 @@ namespace df using DFHack::BitArray; using DFHack::DfArray; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" template void *allocator_fn(void *out, const void *in) { if (out) { *(T*)out = *(const T*)in; return out; } else if (in) { delete (T*)in; return (T*)in; } else return new T(); } +#pragma GCC diagnostic pop template void *allocator_nodel_fn(void *out, const void *in) {