maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9951 from endragor/ref-ptrcall

Browse source 
Fix passing Refs via ptrcall
This commit is contained in:
Thomas Herzog 2017-07-29 17:59:17 +02:00 committed by GitHub
commit d28e9c3c08
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/reference.h
View file

@ -330,7 +330,7 @@ struct PtrToArg<Ref<T> > {
_FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) { _FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) {
return Ref<T>(reinterpret_cast<const T *>(p_ptr)); return Ref<T>(const_cast<T *>(reinterpret_cast<const T *>(p_ptr)));
} }
_FORCE_INLINE_ static void encode(Ref<T> p_val, const void *p_ptr) { _FORCE_INLINE_ static void encode(Ref<T> p_val, const void *p_ptr) {
@ -355,7 +355,7 @@ struct PtrToArg<RefPtr> {
_FORCE_INLINE_ static RefPtr convert(const void *p_ptr) { _FORCE_INLINE_ static RefPtr convert(const void *p_ptr) {
return Ref<Reference>(reinterpret_cast<const Reference *>(p_ptr)).get_ref_ptr(); return Ref<Reference>(const_cast<Reference *>(reinterpret_cast<const Reference *>(p_ptr))).get_ref_ptr();
} }
_FORCE_INLINE_ static void encode(RefPtr p_val, const void *p_ptr) { _FORCE_INLINE_ static void encode(RefPtr p_val, const void *p_ptr) {
@ -370,7 +370,7 @@ struct PtrToArg<const RefPtr &> {
_FORCE_INLINE_ static RefPtr convert(const void *p_ptr) { _FORCE_INLINE_ static RefPtr convert(const void *p_ptr) {
return Ref<Reference>(reinterpret_cast<const Reference *>(p_ptr)).get_ref_ptr(); return Ref<Reference>(const_cast<Reference *>(reinterpret_cast<const Reference *>(p_ptr))).get_ref_ptr();
} }
}; };