From ca6483dbfc1333e8d8e47acf218aa0a6901b8421 Mon Sep 17 00:00:00 2001 From: Francesco Borzì Date: Sat, 17 Jul 2021 00:15:52 +0200 Subject: feat(Deps/g3dlite): replace deprecated is_pod with is_standard_layout (#6894) --- deps/g3dlite/include/G3D/Array.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'deps') diff --git a/deps/g3dlite/include/G3D/Array.h b/deps/g3dlite/include/G3D/Array.h index c86b20fd7e..683d9bf860 100644 --- a/deps/g3dlite/include/G3D/Array.h +++ b/deps/g3dlite/include/G3D/Array.h @@ -346,7 +346,7 @@ public: /** Resizes this to match the size of \a other and then copies the data from other using memcpy. This is only safe for POD types */ void copyPOD(const Array& other) { - static_assert(std::is_pod::value, "copyPOD called on non-POD type"); + static_assert(std::is_standard_layout::value, "copyPOD called on non-POD type"); if (numAllocated < other.num) { m_memoryManager->free(data); data = NULL; @@ -365,7 +365,7 @@ public: /** Resizes this to just barely match the size of \a other + itself and then copies the data to the end of the array from other using memcpy. This is only safe for POD types */ void appendPOD(const Array& other) { - static_assert(std::is_pod::value, "appendPOD called on non-POD type"); + static_assert(std::is_standard_layout::value, "appendPOD called on non-POD type"); const size_t oldSize = num; num += other.num; if (numAllocated < num) { -- cgit v1.2.3