summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-09-04 22:29:43 +0200
committerHein-Pieter van Braam <hp@tmm.cx>2017-09-04 22:29:43 +0200
commitf8cb9f5516cd8081a8a887afdb459cb9d1ff7f16 (patch)
tree4e0b1aca3b790159fbb37be58be4456e26e7dcc9
parent6d233c651b21ecaef78fbb20d0365a22919b72b1 (diff)
Remove NULL check from Object::cast_to()
After discussing this with @reduz on IRC we agreed to remove these checks. We now consider cast_to() to be NULL safe
-rw-r--r--core/object.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/core/object.h b/core/object.h
index 6e1ed4308e..644e2b8270 100644
--- a/core/object.h
+++ b/core/object.h
@@ -567,12 +567,6 @@ public:
template <class T>
static T *cast_to(Object *p_object) {
-#ifdef DEBUG_ENABLED
- // TODO there are some legitimate reasons to pass NULL as p_object.
- // we need to figure out how to deal with that in debug mode.
- // This code will return NULL for a NULL input in release mode also.
- ERR_FAIL_COND_V(p_object == NULL, NULL);
-#endif
#ifndef NO_SAFE_CAST
return dynamic_cast<T *>(p_object);
#else
@@ -587,12 +581,6 @@ public:
template <class T>
static const T *cast_to(const Object *p_object) {
-#ifdef DEBUG_ENABLED
- // TODO there are some legitimate reasons to pass NULL as p_object.
- // we need to figure out how to deal with that in debug mode.
- // This code will return NULL for a NULL input in release mode also.
- ERR_FAIL_COND_V(p_object == NULL, NULL);
-#endif
#ifndef NO_SAFE_CAST
return dynamic_cast<const T *>(p_object);
#else