diff options
| -rw-r--r-- | entityx/Entity.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/entityx/Entity.h b/entityx/Entity.h index c56b37d..6e5eda7 100644 --- a/entityx/Entity.h +++ b/entityx/Entity.h @@ -220,24 +220,19 @@ struct BaseComponent { // NOTE: Component memory is *always* managed by the EntityManager. // Use Entity::destroy() instead. - void operator delete(void *p) { -#ifdef _HAS_EXCEPTIONS - throw std::bad_alloc(); -#else - abort(); -#endif - } + void operator delete(void *p) { fail(); } + void operator delete[](void *p) { fail(); } + - void operator delete[](void *p) { -#ifdef _HAS_EXCEPTIONS + protected: + void fail() { +#if defined(_HAS_EXCEPTIONS) || defined(__EXCEPTIONS) throw std::bad_alloc(); #else - abort(); + std::abort(); #endif - } - - protected: + } static Family family_counter_; }; |