diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-22 14:51:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 14:51:05 +0100 |
| commit | d39f6386ce3a7916dbb94fef5ff65e7599e060f0 (patch) | |
| tree | 3bfc4261f2d9bbfcc7425d29a829a3c5d6d73fc7 /core/io/resource.h | |
| parent | 2a3e771f4cb2b01d6cbd4bf09e1fbd27e3b019c0 (diff) | |
| parent | 8ed259b792f3a94939422384c829a6c6973afec8 (diff) | |
Merge pull request #45314 from RandomShaper/modernize_rwlock
Modernize RWLock
Diffstat (limited to 'core/io/resource.h')
| -rw-r--r-- | core/io/resource.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/io/resource.h b/core/io/resource.h index eda18a8538..d0cd6ea3ac 100644 --- a/core/io/resource.h +++ b/core/io/resource.h @@ -149,16 +149,15 @@ typedef Ref<Resource> RES; class ResourceCache { friend class Resource; friend class ResourceLoader; //need the lock - static RWLock *lock; + static RWLock lock; static HashMap<String, Resource *> resources; #ifdef TOOLS_ENABLED static HashMap<String, HashMap<String, int>> resource_path_cache; // each tscn has a set of resource paths and IDs - static RWLock *path_cache_lock; + static RWLock path_cache_lock; #endif // TOOLS_ENABLED friend void unregister_core_types(); static void clear(); friend void register_core_types(); - static void setup(); public: static void reload_externals(); |