godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

GDScript: Fix MutexLock usage, fixes Clang 6 compat

Browse Source 
Fixes #41852.
This commit is contained in:
Rémi Verschelde
2020-09-09 14:56:57 +02:00
parent 4d34677623
commit 1c881c973b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gdscript/gdscript_cache.cpp
View File

@@ -108,20 +108,20 @@ GDScriptParserRef::~GDScriptParserRef() {
if (analyzer != nullptr) { if (analyzer != nullptr) {
memdelete(analyzer); memdelete(analyzer);
} }
MutexLock(GDScriptCache::singleton->lock); MutexLock lock(GDScriptCache::singleton->lock);
GDScriptCache::singleton->parser_map.erase(path); GDScriptCache::singleton->parser_map.erase(path);
} }
GDScriptCache *GDScriptCache::singleton = nullptr; GDScriptCache *GDScriptCache::singleton = nullptr;
void GDScriptCache::remove_script(const String &p_path) { void GDScriptCache::remove_script(const String &p_path) {
MutexLock(singleton->lock); MutexLock lock(singleton->lock);
singleton->shallow_gdscript_cache.erase(p_path); singleton->shallow_gdscript_cache.erase(p_path);
singleton->full_gdscript_cache.erase(p_path); singleton->full_gdscript_cache.erase(p_path);
} }
Ref<GDScriptParserRef> GDScriptCache::get_parser(const String &p_path, GDScriptParserRef::Status p_status, Error &r_error, const String &p_owner) { Ref<GDScriptParserRef> GDScriptCache::get_parser(const String &p_path, GDScriptParserRef::Status p_status, Error &r_error, const String &p_owner) {
MutexLock(singleton->lock); MutexLock lock(singleton->lock);
Ref<GDScriptParserRef> ref; Ref<GDScriptParserRef> ref;
if (p_owner != String()) { if (p_owner != String()) {
singleton->dependencies[p_owner].insert(p_path); singleton->dependencies[p_owner].insert(p_path);
@@ -168,7 +168,7 @@ String GDScriptCache::get_source_code(const String &p_path) {
} }
Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, const String &p_owner) { Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, const String &p_owner) {
MutexLock(singleton->lock); MutexLock lock(singleton->lock);
if (p_owner != String()) { if (p_owner != String()) {
singleton->dependencies[p_owner].insert(p_path); singleton->dependencies[p_owner].insert(p_path);
} }
@@ -190,7 +190,7 @@ Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, const Stri
} }
Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_error, const String &p_owner) { Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_error, const String &p_owner) {
MutexLock(singleton->lock); MutexLock lock(singleton->lock);
if (p_owner != String()) { if (p_owner != String()) {
singleton->dependencies[p_owner].insert(p_path); singleton->dependencies[p_owner].insert(p_path);