summaryrefslogtreecommitdiff
path: root/core/variant/array.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-31 11:04:21 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-01-31 11:04:21 +0100
commit99a44f846975a87f7dc2f121818c9570b0457b96 (patch)
tree0562814c260f3f73c4cddd18f2cb6a18262b1f20 /core/variant/array.h
parent97de7f39e19ed3658073a6bb626bcafb33039a17 (diff)
parent5909f9f07547895de24fb6965d44c859b69a54a2 (diff)
Merge pull request #69248 from vonagam/fixing-typed-arrays
GDScript: Fix typed arrays
Diffstat (limited to 'core/variant/array.h')
-rw-r--r--core/variant/array.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/variant/array.h b/core/variant/array.h
index d9ca3278fb..4ef8ba8ce7 100644
--- a/core/variant/array.h
+++ b/core/variant/array.h
@@ -43,13 +43,11 @@ class Callable;
class Array {
mutable ArrayPrivate *_p;
- void _ref(const Array &p_from) const;
void _unref() const;
-protected:
- bool _assign(const Array &p_array);
-
public:
+ void _ref(const Array &p_from) const;
+
Variant &operator[](int p_idx);
const Variant &operator[](int p_idx) const;
@@ -68,6 +66,7 @@ public:
uint32_t recursive_hash(int recursion_count) const;
void operator=(const Array &p_array);
+ void assign(const Array &p_array);
void push_back(const Variant &p_value);
_FORCE_INLINE_ void append(const Variant &p_value) { push_back(p_value); } //for python compatibility
void append_array(const Array &p_array);
@@ -120,9 +119,9 @@ public:
const void *id() const;
- bool typed_assign(const Array &p_other);
void set_typed(uint32_t p_type, const StringName &p_class_name, const Variant &p_script);
bool is_typed() const;
+ bool is_same_typed(const Array &p_other) const;
uint32_t get_typed_builtin() const;
StringName get_typed_class_name() const;
Variant get_typed_script() const;