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) {