asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Remove NULL check from Object::cast_to()
This commit is contained in:
Rémi Verschelde 2017-09-05 00:14:35 +02:00 committed by GitHub
commit efa50fbdfd
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/object.h
View file

@ -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