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.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/resource.cpp') diff --git a/core/resource.cpp b/core/resource.cpp index 2afc9e4042..e329a1574f 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -149,7 +149,7 @@ void Resource::reload_from_file() { } } -Ref Resource::duplicate_for_local_scene(Node *p_for_scene, Map, Ref > &remap_cache) { +Ref Resource::duplicate_for_local_scene(Node *p_for_scene, Map, Ref> &remap_cache) { List plist; get_property_list(&plist); @@ -190,7 +190,7 @@ Ref Resource::duplicate_for_local_scene(Node *p_for_scene, Map, Ref > &remap_cache) { +void Resource::configure_for_local_scene(Node *p_for_scene, Map, Ref> &remap_cache) { List plist; get_property_list(&plist); @@ -455,7 +455,7 @@ Resource::~Resource() { HashMap ResourceCache::resources; #ifdef TOOLS_ENABLED -HashMap > ResourceCache::resource_path_cache; +HashMap> ResourceCache::resource_path_cache; #endif RWLock *ResourceCache::lock = NULL; @@ -512,7 +512,7 @@ Resource *ResourceCache::get(const String &p_path) { return *res; } -void ResourceCache::get_cached_resources(List > *p_resources) { +void ResourceCache::get_cached_resources(List> *p_resources) { lock->read_lock(); const String *K = NULL; -- cgit v1.2.3