diff options
author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-05-26 21:11:16 +0200 |
---|---|---|
committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-07-05 09:31:44 +0200 |
commit | 211c4518903d82068c061943064824ac5595fd38 (patch) | |
tree | 5c332554f6df617d5d9d9eb81f1e471517231fbf /core/vmap.h | |
parent | 9fa4f1c54c6d528192e7ed04354d5ce2c733d99a (diff) | |
download | redot-engine-211c4518903d82068c061943064824ac5595fd38.tar.gz |
Implement well-defined handling of unrecoverable errors
Plus the addition of some convenience CRASH_* error macros.
Plus transient avoidance of the flood of warnings emitted by Clang when checking 'this' for NULL.
Plus explanation about the do-while(0) loop in some error macros.
Diffstat (limited to 'core/vmap.h')
-rw-r--r-- | core/vmap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/vmap.h b/core/vmap.h index ad07973308..66f935f58d 100644 --- a/core/vmap.h +++ b/core/vmap.h @@ -180,10 +180,8 @@ public: inline const V &operator[](const T &p_key) const { int pos = _find_exact(p_key); - if (pos < 0) { - const T &aux = *((T *)0); //nullreturn - ERR_FAIL_COND_V(pos < 1, aux); - } + + CRASH_COND(pos < 0); return _data[pos].value; } |