Use safer casts in Ref<T>
parent
43828ebb39
commit
2893c883f8
|
@ -11,6 +11,10 @@ namespace godot {
|
||||||
// Rewritten from f5234e70be7dec4930c2d5a0e829ff480d044b1d.
|
// Rewritten from f5234e70be7dec4930c2d5a0e829ff480d044b1d.
|
||||||
template <class T>
|
template <class T>
|
||||||
class Ref {
|
class Ref {
|
||||||
|
// TODO For this nice check to work, each class must actually #include Reference classes mentionned in its methods,
|
||||||
|
// which might be annoying for coders who prefer to forward-declare to reduce compile times
|
||||||
|
// static_assert(std::is_base_of<Reference, T>::value,
|
||||||
|
// "Ref<T> can only be used with classes deriving from Reference");
|
||||||
|
|
||||||
T *reference = nullptr;
|
T *reference = nullptr;
|
||||||
|
|
||||||
|
@ -28,7 +32,7 @@ class Ref {
|
||||||
|
|
||||||
void ref_pointer(T *p_ref) {
|
void ref_pointer(T *p_ref) {
|
||||||
|
|
||||||
ERR_FAIL_COND(!p_ref);
|
ERR_FAIL_COND(p_ref == nullptr);
|
||||||
|
|
||||||
if (p_ref->init_ref())
|
if (p_ref->init_ref())
|
||||||
reference = p_ref;
|
reference = p_ref;
|
||||||
|
@ -90,32 +94,25 @@ public:
|
||||||
|
|
||||||
template <class T_Other>
|
template <class T_Other>
|
||||||
void operator=(const Ref<T_Other> &p_from) {
|
void operator=(const Ref<T_Other> &p_from) {
|
||||||
|
|
||||||
// TODO We need a safe cast
|
|
||||||
Reference *refb = const_cast<Reference *>(static_cast<const Reference *>(p_from.ptr()));
|
Reference *refb = const_cast<Reference *>(static_cast<const Reference *>(p_from.ptr()));
|
||||||
if (!refb) {
|
if (refb == nullptr) {
|
||||||
unref();
|
unref();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Ref r;
|
Ref r;
|
||||||
//r.reference = Object::cast_to<T>(refb);
|
r.reference = Object::cast_to<T>(refb);
|
||||||
r.reference = (T *)refb;
|
|
||||||
ref(r);
|
ref(r);
|
||||||
r.reference = nullptr;
|
r.reference = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void operator=(const Variant &p_variant) {
|
void operator=(const Variant &p_variant) {
|
||||||
|
Object *refb = T::___get_from_variant(p_variant);
|
||||||
// TODO We need a safe cast
|
if (refb == nullptr) {
|
||||||
Reference *refb = (Reference *)T::___get_from_variant(p_variant);
|
|
||||||
if (!refb) {
|
|
||||||
unref();
|
unref();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Ref r;
|
Ref r;
|
||||||
// TODO We need a safe cast
|
r.reference = Object::cast_to<T>(refb);
|
||||||
//r.reference = Object::cast_to<T>(refb);
|
|
||||||
r.reference = (T *)refb;
|
|
||||||
ref(r);
|
ref(r);
|
||||||
r.reference = nullptr;
|
r.reference = nullptr;
|
||||||
}
|
}
|
||||||
|
@ -128,18 +125,14 @@ public:
|
||||||
|
|
||||||
template <class T_Other>
|
template <class T_Other>
|
||||||
Ref(const Ref<T_Other> &p_from) {
|
Ref(const Ref<T_Other> &p_from) {
|
||||||
|
|
||||||
reference = nullptr;
|
reference = nullptr;
|
||||||
// TODO We need a safe cast
|
|
||||||
Reference *refb = const_cast<Reference *>(static_cast<const Reference *>(p_from.ptr()));
|
Reference *refb = const_cast<Reference *>(static_cast<const Reference *>(p_from.ptr()));
|
||||||
if (!refb) {
|
if (refb == nullptr) {
|
||||||
unref();
|
unref();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Ref r;
|
Ref r;
|
||||||
// TODO We need a safe cast
|
r.reference = Object::cast_to<T>(refb);
|
||||||
//r.reference = Object::cast_to<T>(refb);
|
|
||||||
r.reference = (T *)refb;
|
|
||||||
ref(r);
|
ref(r);
|
||||||
r.reference = nullptr;
|
r.reference = nullptr;
|
||||||
}
|
}
|
||||||
|
@ -155,16 +148,13 @@ public:
|
||||||
Ref(const Variant &p_variant) {
|
Ref(const Variant &p_variant) {
|
||||||
|
|
||||||
reference = nullptr;
|
reference = nullptr;
|
||||||
// TODO We need a safe cast
|
Object *refb = T::___get_from_variant(p_variant);
|
||||||
Reference *refb = (Reference *)T::___get_from_variant(p_variant);
|
if (refb == nullptr) {
|
||||||
if (!refb) {
|
|
||||||
unref();
|
unref();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Ref r;
|
Ref r;
|
||||||
// TODO We need a safe cast
|
r.reference = Object::cast_to<T>(refb);
|
||||||
//r.reference = Object::cast_to<T>(refb);
|
|
||||||
r.reference = (T *)refb;
|
|
||||||
ref(r);
|
ref(r);
|
||||||
r.reference = nullptr;
|
r.reference = nullptr;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue