diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-16 11:59:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-16 11:59:38 +0200 |
commit | c1277c2183eaacb9ae49f9fef0c57443b934b72b (patch) | |
tree | 434b526eb286850ebccc6d2c998a7d90fdb8b5e2 /core/io/json.cpp | |
parent | 396def9b66c476f7834604adb7136ca903ed01be (diff) | |
parent | 746dddc0673d7261f19b1e056e90e6e3a49ef33a (diff) | |
download | redot-engine-c1277c2183eaacb9ae49f9fef0c57443b934b72b.tar.gz |
Merge pull request #60999 from reduz/replace-rbhash-by-hashmap
Diffstat (limited to 'core/io/json.cpp')
-rw-r--r-- | core/io/json.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/json.cpp b/core/io/json.cpp index 4b745dff44..b3a9762e75 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, Set<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, RBSet<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) { - Set<const void *> markers; + RBSet<const void *> markers; return _stringify(p_var, p_indent, 0, p_sort_keys, markers, p_full_precision); } |