Browse Source

Merge pull request #10975 from hpvb/remove-null-check-from-cast-to

Remove NULL check from Object::cast_to()
Rémi Verschelde 8 years ago
parent
commit
efa50fbdfd
1 changed files with 0 additions and 12 deletions
  1. 0 12
      core/object.h

+ 0 - 12
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