Commit 3cd3c1da by Henrik Andersson

Fix refactored Object::cast_to in NO_SAFE_CAST branch

parent dd7145b7
......@@ -571,8 +571,8 @@ public:
#else
if (!p_object)
return NULL;
if (p_pobject->is_class_ptr(T::get_class_ptr_static()))
return static_cast<T *>(p_pobject);
if (p_object->is_class_ptr(T::get_class_ptr_static()))
return static_cast<T *>(p_object);
else
return NULL;
#endif
......@@ -591,7 +591,7 @@ public:
#else
if (!p_object)
return NULL;
if (p_pobject->is_class_ptr(T::get_class_ptr_static()))
if (p_object->is_class_ptr(T::get_class_ptr_static()))
return static_cast<const T *>(p_object);
else
return NULL;
......
......@@ -112,7 +112,7 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
Ref<Reference> ref = *p_args[i];
if (!ref.is_null()) {
if (Object::cast_to<JavaObject>(ref)) {
if (Object::cast_to<JavaObject>(ref.ptr())) {
Ref<JavaObject> jo = ref;
//could be faster
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment