Fix broken compilation after Godo's API changes

perbone · perbone · commit 43bcbaa558e8 · 2022-05-22T02:01:55.000-03:00
diff --git a/lua_script.cpp b/lua_script.cpp
@@ -245,7 +245,7 @@ void LuaScript::get_constants(HashMap<StringName, Variant> *p_constants) {
 
 } // TODO
 
-void LuaScript::get_members(RBSet<StringName> *p_members) {
+void LuaScript::get_members(HashSet<StringName> *p_members) {
 	print_debug("LuaScript::get_members");
 #if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
 
diff --git a/lua_script.h b/lua_script.h
@@ -75,7 +75,7 @@ class LuaScript : public Script {
 	int get_member_line(const StringName &p_member) const override;
 
 	void get_constants(HashMap<StringName, Variant> *p_constants) override;
-	void get_members(RBSet<StringName> *p_members) override;
+	void get_members(HashSet<StringName> *p_members) override;
 
 #ifdef TOOLS_ENABLED
 	bool is_placeholder_fallback_enabled() const override;
@@ -110,12 +110,12 @@ class LuaScript : public Script {
 
 	String source{};
 
-	RBSet<Object *> instances{};
+	HashSet<Object *> instances{};
 
 #ifdef TOOLS_ENABLED
 	bool source_changed_cache{};
 	bool placeholder_fallback_enabled{};
-	RBSet<PlaceHolderScriptInstance *> placeholders{};
+	HashSet<PlaceHolderScriptInstance *> placeholders{};
 	Vector<DocData::ClassDoc> docs{};
 #endif
 };
diff --git a/lua_script_language.cpp b/lua_script_language.cpp
@@ -208,7 +208,7 @@ bool LuaScriptLanguage::validate(
 		List<String> *r_functions,
 		List<ScriptError> *r_errors,
 		List<Warning> *r_warnings,
-		RBSet<int> *r_safe_lines) const {
+		HashSet<int> *r_safe_lines) const {
 	print_debug("LuaScriptLanguage::validate( p_path = %s )", p_path.ascii().get_data());
 
 	parser::ast::AST ast = parser.parse(p_script.ascii().get_data());
diff --git a/lua_script_language.h b/lua_script_language.h
@@ -55,7 +55,7 @@ class LuaScriptLanguage : public ScriptLanguage {
 	Ref<Script> make_template(const String &p_template, const String &p_class_name, const String &p_base_class_name) const override;
 	Vector<ScriptTemplate> get_built_in_templates(StringName p_object) override;
 	bool is_using_templates() override;
-	bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, RBSet<int> *r_safe_lines = nullptr) const override;
+	bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const override;
 	String validate_path(const String &p_path) const override;
 	Script *create_script() const override;
 	bool has_named_classes() const override;
