aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2017-11-11 16:30:45 +0100
committerjackpoz <giacomopoz@gmail.com>2017-11-11 16:30:45 +0100
commitf017b1d470aec0ca4918e059343d57de99fb2254 (patch)
treec83325d584195bb0f0a967fdcc96b69b6affab7d
parentc69825d96d6c7ff847c196c908e1040cb7a8d5db (diff)
Dep/G3D: Add static assert checks for Array functions being used with non-POD types
-rw-r--r--dep/g3dlite/include/G3D/Array.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/dep/g3dlite/include/G3D/Array.h b/dep/g3dlite/include/G3D/Array.h
index c562f5c920f..c86b20fd7e9 100644
--- a/dep/g3dlite/include/G3D/Array.h
+++ b/dep/g3dlite/include/G3D/Array.h
@@ -346,6 +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<T>& other) {
+ static_assert(std::is_pod<T>::value, "copyPOD called on non-POD type");
if (numAllocated < other.num) {
m_memoryManager->free(data);
data = NULL;
@@ -364,6 +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<T>& other) {
+ static_assert(std::is_pod<T>::value, "appendPOD called on non-POD type");
const size_t oldSize = num;
num += other.num;
if (numAllocated < num) {