|
@@ -42,7 +42,7 @@ class TypedArray : public Array {
|
|
public:
|
|
public:
|
|
_FORCE_INLINE_ void operator=(const Array &p_array) {
|
|
_FORCE_INLINE_ void operator=(const Array &p_array) {
|
|
ERR_FAIL_COND_MSG(!is_same_typed(p_array), "Cannot assign an array with a different element type.");
|
|
ERR_FAIL_COND_MSG(!is_same_typed(p_array), "Cannot assign an array with a different element type.");
|
|
- _ref(p_array);
|
|
|
|
|
|
+ Array::operator=(p_array);
|
|
}
|
|
}
|
|
_FORCE_INLINE_ TypedArray(const Variant &p_variant) :
|
|
_FORCE_INLINE_ TypedArray(const Variant &p_variant) :
|
|
TypedArray(Array(p_variant)) {
|
|
TypedArray(Array(p_variant)) {
|
|
@@ -50,7 +50,7 @@ public:
|
|
_FORCE_INLINE_ TypedArray(const Array &p_array) {
|
|
_FORCE_INLINE_ TypedArray(const Array &p_array) {
|
|
set_typed(Variant::OBJECT, T::get_class_static(), Variant());
|
|
set_typed(Variant::OBJECT, T::get_class_static(), Variant());
|
|
if (is_same_typed(p_array)) {
|
|
if (is_same_typed(p_array)) {
|
|
- _ref(p_array);
|
|
|
|
|
|
+ Array::operator=(p_array);
|
|
} else {
|
|
} else {
|
|
assign(p_array);
|
|
assign(p_array);
|
|
}
|
|
}
|
|
@@ -81,7 +81,7 @@ struct VariantInternalAccessor<const TypedArray<T> &> {
|
|
public: \
|
|
public: \
|
|
_FORCE_INLINE_ void operator=(const Array &p_array) { \
|
|
_FORCE_INLINE_ void operator=(const Array &p_array) { \
|
|
ERR_FAIL_COND_MSG(!is_same_typed(p_array), "Cannot assign an array with a different element type."); \
|
|
ERR_FAIL_COND_MSG(!is_same_typed(p_array), "Cannot assign an array with a different element type."); \
|
|
- _ref(p_array); \
|
|
|
|
|
|
+ Array::operator=(p_array); \
|
|
} \
|
|
} \
|
|
_FORCE_INLINE_ TypedArray(std::initializer_list<Variant> p_init) : \
|
|
_FORCE_INLINE_ TypedArray(std::initializer_list<Variant> p_init) : \
|
|
Array(Array(p_init), m_variant_type, StringName(), Variant()) { \
|
|
Array(Array(p_init), m_variant_type, StringName(), Variant()) { \
|
|
@@ -92,7 +92,7 @@ struct VariantInternalAccessor<const TypedArray<T> &> {
|
|
_FORCE_INLINE_ TypedArray(const Array &p_array) { \
|
|
_FORCE_INLINE_ TypedArray(const Array &p_array) { \
|
|
set_typed(m_variant_type, StringName(), Variant()); \
|
|
set_typed(m_variant_type, StringName(), Variant()); \
|
|
if (is_same_typed(p_array)) { \
|
|
if (is_same_typed(p_array)) { \
|
|
- _ref(p_array); \
|
|
|
|
|
|
+ Array::operator=(p_array); \
|
|
} else { \
|
|
} else { \
|
|
assign(p_array); \
|
|
assign(p_array); \
|
|
} \
|
|
} \
|