diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-26 20:32:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 20:32:23 +0200 |
| commit | 53c0010932f9c1becb63c16243f3a00ede359989 (patch) | |
| tree | d03fc935ffd4d1fbcfe13492bb8b3e53ffd2a546 | |
| parent | 53acb7876d1a3b2c22e29be033bf9ce0e04f309a (diff) | |
| parent | 3cd3c1da5f965d6cc55134ac812a8ea0fd0dcdd7 (diff) | |
Merge pull request #10658 from henkz1/android-build
Fix Android build
| -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 |