asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warnings about non-static data member initializers in nativescript

Browse source 
Fixes the following GCC/Clang warnings:
```
modules/gdnative/nativescript/nativescript.h:280:37: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
modules/gdnative/nativescript/nativescript.h:281:37: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
modules/gdnative/nativescript/nativescript.h:283:42: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
modules/gdnative/nativescript/nativescript.h:285:38: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
modules/gdnative/nativescript/nativescript.h:287:38: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
modules/gdnative/nativescript/nativescript.h:290:45: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
modules/gdnative/nativescript/nativescript.h:291:44: warning: non-static data member initializers only available with -std=c++11 or -std=gnu++11
```
This commit is contained in:
Rémi Verschelde 2018-10-04 09:49:46 +02:00
parent bdf898e38d
commit e9cb01e366
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 #ifdef DEBUG_ENABLED
profiling = false; profiling = false;
#endif #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() { NativeScriptLanguage::~NativeScriptLanguage() {

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

@ -277,18 +277,14 @@ public:
Map<String, Set<NativeScript *> > library_script_users; Map<String, Set<NativeScript *> > library_script_users;
const StringName _init_call_type = "nativescript_init"; StringName _init_call_type;
const StringName _init_call_name = "nativescript_init"; StringName _init_call_name;
StringName _terminate_call_name;
const StringName _terminate_call_name = "nativescript_terminate"; StringName _noarg_call_type;
StringName _frame_call_name;
const StringName _noarg_call_type = "nativescript_no_arg";
const StringName _frame_call_name = "nativescript_frame";
#ifndef NO_THREADS #ifndef NO_THREADS
const StringName _thread_enter_call_name = "nativescript_thread_enter"; StringName _thread_enter_call_name;
const StringName _thread_exit_call_name = "nativescript_thread_exit"; StringName _thread_exit_call_name;
#endif #endif
NativeScriptLanguage(); NativeScriptLanguage();