maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #22708 from akien-mga/fix-warnings

Browse source 
Fix warnings about non-static data member initializers in nativescript
This commit is contained in:
Rémi Verschelde 2018-10-04 10:09:20 +02:00 committed by GitHub
parent bdf898e38d e9cb01e366
commit cfa373c69f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/gdnative/nativescript/nativescript.cpp
View file

@ -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() {

18
modules/gdnative/nativescript/nativescript.h
View file

@ -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();