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`. --- core/resource.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/resource.h') diff --git a/core/resource.h b/core/resource.h index b30788010b..4b79a39d9d 100644 --- a/core/resource.h +++ b/core/resource.h @@ -103,8 +103,8 @@ public: int get_subindex() const; virtual Ref duplicate(bool p_subresources = false) const; - Ref duplicate_for_local_scene(Node *p_for_scene, Map, Ref > &remap_cache); - void configure_for_local_scene(Node *p_for_scene, Map, Ref > &remap_cache); + Ref duplicate_for_local_scene(Node *p_for_scene, Map, Ref> &remap_cache); + void configure_for_local_scene(Node *p_for_scene, Map, Ref> &remap_cache); void set_local_to_scene(bool p_enable); bool is_local_to_scene() const; @@ -150,7 +150,7 @@ class ResourceCache { static RWLock *lock; static HashMap resources; #ifdef TOOLS_ENABLED - static HashMap > resource_path_cache; // each tscn has a set of resource paths and IDs + static HashMap> resource_path_cache; // each tscn has a set of resource paths and IDs static RWLock *path_cache_lock; #endif // TOOLS_ENABLED friend void unregister_core_types(); @@ -163,7 +163,7 @@ public: static bool has(const String &p_path); static Resource *get(const String &p_path); static void dump(const char *p_file = NULL, bool p_short = false); - static void get_cached_resources(List > *p_resources); + static void get_cached_resources(List> *p_resources); static int get_cached_resource_count(); }; -- cgit v1.2.3