From cb282c6ef0bb91957f8a6f422705813bd47c788c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 17 Mar 2020 07:33:00 +0100 Subject: Style: Set clang-format Standard to Cpp11 For us, it practically only changes the fact that `A>` is now used instead of the C++03 compatible `A >`. Note: clang-format 10+ changed the `Standard` arguments to fully specified `c++11`, `c++14`, etc. versions, but we can't use `c++17` now if we want to preserve compatibility with clang-format 8 and 9. `Cpp11` is still supported as deprecated alias for `Latest`. --- modules/mono/csharp_script.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'modules/mono/csharp_script.cpp') diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 02ff6bcf13..1f56b77d93 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -763,7 +763,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { // There is no soft reloading with Mono. It's always hard reloading. - List > scripts; + List> scripts; { MutexLock lock(script_instances_mutex); @@ -774,10 +774,10 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { } } - List > to_reload; + List> to_reload; // We need to keep reference instances alive during reloading - List > ref_instances; + List> ref_instances; for (Map::Element *E = script_bindings.front(); E; E = E->next()) { CSharpScriptBinding &script_binding = E->value(); @@ -791,7 +791,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { scripts.sort_custom(); // Update in inheritance dependency order - for (List >::Element *E = scripts.front(); E; E = E->next()) { + for (List>::Element *E = scripts.front(); E; E = E->next()) { Ref &script = E->get(); to_reload.push_back(script); @@ -851,7 +851,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { } // After the state of all instances is saved, clear scripts and script instances - for (List >::Element *E = scripts.front(); E; E = E->next()) { + for (List>::Element *E = scripts.front(); E; E = E->next()) { Ref &script = E->get(); while (script->instances.front()) { @@ -866,7 +866,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { if (gdmono->reload_scripts_domain() != OK) { // Failed to reload the scripts domain // Make sure to add the scripts back to their owners before returning - for (List >::Element *E = to_reload.front(); E; E = E->next()) { + for (List>::Element *E = to_reload.front(); E; E = E->next()) { Ref scr = E->get(); for (const Map::Element *F = scr->pending_reload_state.front(); F; F = F->next()) { @@ -891,7 +891,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { #endif // Restore Variant properties state, it will be kept by the placeholder until the next script reloading - for (List >::Element *G = scr->pending_reload_state[obj_id].properties.front(); G; G = G->next()) { + for (List>::Element *G = scr->pending_reload_state[obj_id].properties.front(); G; G = G->next()) { placeholder->property_set_fallback(G->get().first, G->get().second, NULL); } @@ -902,9 +902,9 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { return; } - List > to_reload_state; + List> to_reload_state; - for (List >::Element *E = to_reload.front(); E; E = E->next()) { + for (List>::Element *E = to_reload.front(); E; E = E->next()) { Ref script = E->get(); if (!script->get_path().empty()) { @@ -1012,7 +1012,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { to_reload_state.push_back(script); } - for (List >::Element *E = to_reload_state.front(); E; E = E->next()) { + for (List>::Element *E = to_reload_state.front(); E; E = E->next()) { Ref script = E->get(); for (Set::Element *F = script->pending_reload_instances.front(); F; F = F->next()) { @@ -1030,7 +1030,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) { CSharpScript::StateBackup &state_backup = script->pending_reload_state[obj_id]; - for (List >::Element *G = state_backup.properties.front(); G; G = G->next()) { + for (List>::Element *G = state_backup.properties.front(); G; G = G->next()) { obj->get_script_instance()->set(G->get().first, G->get().second); } @@ -1585,7 +1585,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const { return false; } -void CSharpInstance::get_properties_state_for_reloading(List > &r_state) { +void CSharpInstance::get_properties_state_for_reloading(List> &r_state) { List pinfo; get_property_list(&pinfo); @@ -3294,7 +3294,7 @@ bool CSharpScript::has_script_signal(const StringName &p_signal) const { } void CSharpScript::get_script_signal_list(List *r_signals) const { - for (const Map >::Element *E = _signals.front(); E; E = E->next()) { + for (const Map>::Element *E = _signals.front(); E; E = E->next()) { MethodInfo mi; mi.name = E->key(); -- cgit v1.2.3