diff options
| author | Henrik Andersson <henke@henkeandersson.se> | 2017-08-26 17:10:58 +0200 |
|---|---|---|
| committer | Henrik Andersson <henke@henkeandersson.se> | 2017-08-26 18:59:37 +0200 |
| commit | 3cd3c1da5f965d6cc55134ac812a8ea0fd0dcdd7 (patch) | |
| tree | 00e69e0866460666d4f866f1701b4c3cad02fabf | |
| parent | dd7145b778ea4884fd52f5efaf79dc55375c8465 (diff) | |
Fix refactored Object::cast_to in NO_SAFE_CAST branch
| -rw-r--r-- | core/object.h | 6 | ||||
| -rw-r--r-- | platform/android/java_class_wrapper.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/object.h b/core/object.h index 88229d27b6..9eb6cd1d56 100644 --- a/core/object.h +++ b/core/object.h @@ -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; diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index 5693195bfa..ffd9150ba4 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -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 |