summaryrefslogtreecommitdiff
path: root/core/io/json.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-05-21 01:06:21 +0200
committerGitHub <noreply@github.com>2022-05-21 01:06:21 +0200
commit8adf04804550957f43c810b13fcce66dd76e5fd8 (patch)
tree2ee58365f1092587277770ceaedfc1e35454acfd /core/io/json.cpp
parentf4126cc902b0cbb100bcf1b37ee15df5a8430d21 (diff)
parent45af29da8095af16729955117a165d23e77cd740 (diff)
Merge pull request #61194 from reduz/new-hash-set
Add a new HashSet template
Diffstat (limited to 'core/io/json.cpp')
-rw-r--r--core/io/json.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp
index b3a9762e75..4c4d91f851 100644
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -55,7 +55,7 @@ String JSON::_make_indent(const String &p_indent, int p_size) {
return indent_text;
}
-String JSON::_stringify(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys, RBSet<const void *> &p_markers, bool p_full_precision) {
+String JSON::_stringify(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys, HashSet<const void *> &p_markers, bool p_full_precision) {
String colon = ":";
String end_statement = "";
@@ -529,7 +529,7 @@ Error JSON::_parse_string(const String &p_json, Variant &r_ret, String &r_err_st
}
String JSON::stringify(const Variant &p_var, const String &p_indent, bool p_sort_keys, bool p_full_precision) {
- RBSet<const void *> markers;
+ HashSet<const void *> markers;
return _stringify(p_var, p_indent, 0, p_sort_keys, markers, p_full_precision);
}