Browse Source

Merge pull request #10658 from henkz1/android-build

Fix Android build
Rémi Verschelde 8 years ago
parent
commit
53c0010932
2 changed files with 4 additions and 4 deletions
  1. 3 3
      core/object.h
  2. 1 1
      platform/android/java_class_wrapper.cpp

+ 3 - 3
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;

+ 1 - 1
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