summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-02-04 00:24:06 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-02-04 00:24:06 +0100
commitbbff9fd7a401b5ef39bc1f9337a0477c63dff654 (patch)
treedc0e1d2720656c48f96fc6fe9ee6a73f79f3a745 /core
parentea5cf7d4b8cf5cf988f32ef736de8a706b96f47b (diff)
parent54f8fb010c28ac0ce594a53a61ebdb8a645ce1db (diff)
Merge pull request #71786 from raulsntos/dotnet/array
Sync C# Array with Core
Diffstat (limited to 'core')
-rw-r--r--core/variant/array.cpp4
-rw-r--r--core/variant/array.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index 2d7dff0b27..2e1adb9167 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -629,14 +629,14 @@ void Array::shuffle() {
}
}
-int Array::bsearch(const Variant &p_value, bool p_before) {
+int Array::bsearch(const Variant &p_value, bool p_before) const {
Variant value = p_value;
ERR_FAIL_COND_V(!_p->typed.validate(value, "binary search"), -1);
SearchArray<Variant, _ArrayVariantSort> avs;
return avs.bisect(_p->array.ptrw(), _p->array.size(), value, p_before);
}
-int Array::bsearch_custom(const Variant &p_value, const Callable &p_callable, bool p_before) {
+int Array::bsearch_custom(const Variant &p_value, const Callable &p_callable, bool p_before) const {
Variant value = p_value;
ERR_FAIL_COND_V(!_p->typed.validate(value, "custom binary search"), -1);
diff --git a/core/variant/array.h b/core/variant/array.h
index 4ef8ba8ce7..8b1f8c0678 100644
--- a/core/variant/array.h
+++ b/core/variant/array.h
@@ -83,8 +83,8 @@ public:
void sort();
void sort_custom(const Callable &p_callable);
void shuffle();
- int bsearch(const Variant &p_value, bool p_before = true);
- int bsearch_custom(const Variant &p_value, const Callable &p_callable, bool p_before = true);
+ int bsearch(const Variant &p_value, bool p_before = true) const;
+ int bsearch_custom(const Variant &p_value, const Callable &p_callable, bool p_before = true) const;
void reverse();
int find(const Variant &p_value, int p_from = 0) const;