diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-28 11:51:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 11:51:27 +0100 |
| commit | 5beccaf86fc89166d0b7d28cfcf719cad8fb30ee (patch) | |
| tree | 6bd984ee2fc3c4f4cedd3737ab269ecb1e39f02b /core/string_name.h | |
| parent | 42ffcaa4f756115d26f7f1d9fd1ba5b13b7bf1e8 (diff) | |
| parent | 0115d88072dd59122a54688ff1d4c01d6387ac3a (diff) | |
| download | redot-engine-5beccaf86fc89166d0b7d28cfcf719cad8fb30ee.tar.gz | |
Merge pull request #36635 from RandomShaper/fix_build_error
Fix shadowed variable build error
Diffstat (limited to 'core/string_name.h')
| -rw-r--r-- | core/string_name.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/string_name.h b/core/string_name.h index 0cf2f126aa..e68ab8bfa3 100644 --- a/core/string_name.h +++ b/core/string_name.h @@ -82,7 +82,7 @@ class StringName { friend void register_core_types(); friend void unregister_core_types(); - static Mutex lock; + static Mutex mutex; static void setup(); static void cleanup(); static bool configured; |