diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-19 16:05:16 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-19 16:05:16 +0200 |
| commit | af919a845ff60b4853475204c62f2b98be0b34f0 (patch) | |
| tree | 7aa20707519e2e31ff4047a07cbd1caf625cf41b /core/string/string_name.h | |
| parent | 93fe5c659868442ca06f69d1c34fd009b07395ab (diff) | |
| parent | 723878bbabfa7f47049e29b1c46c92358517d8d1 (diff) | |
| download | redot-engine-af919a845ff60b4853475204c62f2b98be0b34f0.tar.gz | |
Merge pull request #94683 from kisg/string_name_fix
StringName: Use inline static field definitions
Diffstat (limited to 'core/string/string_name.h')
| -rw-r--r-- | core/string/string_name.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/string/string_name.h b/core/string/string_name.h index 89b4c07e0e..0eb98cf64b 100644 --- a/core/string/string_name.h +++ b/core/string/string_name.h @@ -67,7 +67,7 @@ class StringName { _Data() {} }; - static _Data *_table[STRING_TABLE_LEN]; + static inline _Data *_table[STRING_TABLE_LEN]; _Data *_data = nullptr; @@ -75,10 +75,10 @@ class StringName { friend void register_core_types(); friend void unregister_core_types(); friend class Main; - static Mutex mutex; + static inline Mutex mutex; static void setup(); static void cleanup(); - static bool configured; + static inline bool configured = false; #ifdef DEBUG_ENABLED struct DebugSortReferences { bool operator()(const _Data *p_left, const _Data *p_right) const { @@ -86,7 +86,7 @@ class StringName { } }; - static bool debug_stringname; + static inline bool debug_stringname = false; #endif StringName(_Data *p_data) { _data = p_data; } |