MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide warnings about non-virtual destructors from df-structures.

develop
Ben Lubar 2018-04-05 14:46:28 -05:00
parent 8a53ad543f
commit 9cbba0ae01
No known key found for this signature in database
GPG Key ID: 018BAB45DB2D2B24
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/include/DataDefs.h
Unescape Escape View File

@ -423,12 +423,15 @@ namespace df
using DFHack::BitArray; using DFHack::BitArray;
using DFHack::DfArray; using DFHack::DfArray;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
template<class T> template<class T>
void *allocator_fn(void *out, const void *in) { void *allocator_fn(void *out, const void *in) {
if (out) { *(T*)out = *(const T*)in; return out; } if (out) { *(T*)out = *(const T*)in; return out; }
else if (in) { delete (T*)in; return (T*)in; } else if (in) { delete (T*)in; return (T*)in; }
else return new T(); else return new T();
} }
#pragma GCC diagnostic pop
template<class T> template<class T>
void *allocator_nodel_fn(void *out, const void *in) { void *allocator_nodel_fn(void *out, const void *in) {