diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-04 10:09:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 10:09:20 +0200 |
| commit | cfa373c69f6af64d9fce8f1773a4b795f361a34c (patch) | |
| tree | 8a083da57b2c6fccf47af4135a2298199869d833 /modules/gdnative | |
| parent | bdf898e38d8f7d87496a4ba30a2c2da2f6771988 (diff) | |
| parent | e9cb01e3665015616f7da05fb449eb7def359712 (diff) | |
Merge pull request #22708 from akien-mga/fix-warnings
Fix warnings about non-static data member initializers in nativescript
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 10 | ||||
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.h | 18 |
2 files changed, 17 insertions, 11 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 641e4021d8..37e72bf9f8 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -1016,6 +1016,16 @@ NativeScriptLanguage::NativeScriptLanguage() { #ifdef DEBUG_ENABLED profiling = false; #endif + + _init_call_type = "nativescript_init"; + _init_call_name = "nativescript_init"; + _terminate_call_name = "nativescript_terminate"; + _noarg_call_type = "nativescript_no_arg"; + _frame_call_name = "nativescript_frame"; +#ifndef NO_THREADS + _thread_enter_call_name = "nativescript_thread_enter"; + _thread_exit_call_name = "nativescript_thread_exit"; +#endif } NativeScriptLanguage::~NativeScriptLanguage() { diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h index ade8ffd280..54ad31255c 100644 --- a/modules/gdnative/nativescript/nativescript.h +++ b/modules/gdnative/nativescript/nativescript.h @@ -277,18 +277,14 @@ public: Map<String, Set<NativeScript *> > library_script_users; - const StringName _init_call_type = "nativescript_init"; - const StringName _init_call_name = "nativescript_init"; - - const StringName _terminate_call_name = "nativescript_terminate"; - - const StringName _noarg_call_type = "nativescript_no_arg"; - - const StringName _frame_call_name = "nativescript_frame"; - + StringName _init_call_type; + StringName _init_call_name; + StringName _terminate_call_name; + StringName _noarg_call_type; + StringName _frame_call_name; #ifndef NO_THREADS - const StringName _thread_enter_call_name = "nativescript_thread_enter"; - const StringName _thread_exit_call_name = "nativescript_thread_exit"; + StringName _thread_enter_call_name; + StringName _thread_exit_call_name; #endif NativeScriptLanguage(); |