diff --git a/Source/Engine/Scripting/ManagedCLR/MClass.cpp b/Source/Engine/Scripting/ManagedCLR/MClass.cpp index 1c88afdb2..90e1c0d9f 100644 --- a/Source/Engine/Scripting/ManagedCLR/MClass.cpp +++ b/Source/Engine/Scripting/ManagedCLR/MClass.cpp @@ -118,9 +118,9 @@ bool MClass::IsSubClassOf(const MClass* klass) const } #if USE_MONO -bool MClass::IsSubClassOf(MonoClass* monoClass) const +bool MClass::IsSubClassOf(const MonoClass* monoClass) const { - return monoClass && mono_class_is_subclass_of(_monoClass, monoClass, true) != 0; + return monoClass && mono_class_is_subclass_of(_monoClass, (MonoClass*)monoClass, true) != 0; } #endif diff --git a/Source/Engine/Scripting/ManagedCLR/MClass.h b/Source/Engine/Scripting/ManagedCLR/MClass.h index d0b0923d2..d6da7f707 100644 --- a/Source/Engine/Scripting/ManagedCLR/MClass.h +++ b/Source/Engine/Scripting/ManagedCLR/MClass.h @@ -151,7 +151,7 @@ public: /// /// The Mono class. /// True if this class is a sub class of the specified class. - bool IsSubClassOf(MonoClass* monoClass) const; + bool IsSubClassOf(const MonoClass* monoClass) const; #endif /// diff --git a/Source/Engine/Scripting/ScriptingObject.cpp b/Source/Engine/Scripting/ScriptingObject.cpp index f547ba938..8075aa67c 100644 --- a/Source/Engine/Scripting/ScriptingObject.cpp +++ b/Source/Engine/Scripting/ScriptingObject.cpp @@ -367,7 +367,7 @@ bool ScriptingObject::CanCast(const ScriptingTypeHandle& from, const ScriptingTy return CanCast(from.GetType().ManagedClass, to.GetType().ManagedClass); } -bool ScriptingObject::CanCast(MClass* from, MClass* to) +bool ScriptingObject::CanCast(const MClass* from, const MClass* to) { if (!from && !to) return true; @@ -383,7 +383,7 @@ bool ScriptingObject::CanCast(MClass* from, MClass* to) #if USE_MONO -bool ScriptingObject::CanCast(MClass* from, MonoClass* to) +bool ScriptingObject::CanCast(const MClass* from, const MonoClass* to) { if (!from && !to) return true; diff --git a/Source/Engine/Scripting/ScriptingObject.h b/Source/Engine/Scripting/ScriptingObject.h index aae6af623..7db036e17 100644 --- a/Source/Engine/Scripting/ScriptingObject.h +++ b/Source/Engine/Scripting/ScriptingObject.h @@ -147,9 +147,9 @@ public: /// The object class for the cast. /// The destination class to the cast. /// True if can, otherwise false. - static bool CanCast(MClass* from, MClass* to); + static bool CanCast(const MClass* from, const MClass* to); #if USE_MONO - static bool CanCast(MClass* from, MonoClass* to); + static bool CanCast(const MClass* from, const MonoClass* to); #endif template @@ -160,7 +160,7 @@ public: bool Is(const ScriptingTypeHandle& type) const; - bool Is(MClass* type) const + bool Is(const MClass* type) const { return CanCast(GetClass(), type); }