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

Merge pull request #22653 from neikeq/mono-mod-fix-gcc-warnings

Browse source 
Fix GCC compiler warning in mono module
This commit is contained in:
Rémi Verschelde 2018-10-03 08:43:43 +02:00 committed by GitHub
commit 64962fe605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mono/editor/bindings_generator.cpp
View file

@ -2244,8 +2244,8 @@ void BindingsGenerator::_populate_global_constants() {
String constant_name = GlobalConstants::get_global_constant_name(i);
const DocData::ConstantDoc *const_doc = NULL;
for (int i = 0; i < global_scope_doc.constants.size(); i++) {
const DocData::ConstantDoc &curr_const_doc = global_scope_doc.constants[i];
for (int j = 0; j < global_scope_doc.constants.size(); j++) {
const DocData::ConstantDoc &curr_const_doc = global_scope_doc.constants[j];
if (curr_const_doc.name == constant_name) {
const_doc = &curr_const_doc;

6
modules/mono/editor/mono_bottom_panel.cpp
View file

@ -475,14 +475,14 @@ void MonoBuildTab::_bind_methods() {
}
MonoBuildTab::MonoBuildTab(const MonoBuildInfo &p_build_info, const String &p_logs_dir) :
build_info(p_build_info),
logs_dir(p_logs_dir),
build_exited(false),
issues_list(memnew(ItemList)),
error_count(0),
warning_count(0),
errors_visible(true),
warnings_visible(true) {
warnings_visible(true),
logs_dir(p_logs_dir),
build_info(p_build_info) {
issues_list->set_v_size_flags(SIZE_EXPAND_FILL);
issues_list->connect("item_activated", this, "_issue_activated");
add_child(issues_list);

2
modules/mono/utils/mono_reg_utils.cpp
View file

@ -228,4 +228,4 @@ cleanup:
}
} // namespace MonoRegUtils
#endif WINDOWS_ENABLED
#endif // WINDOWS_ENABLED

22
modules/mono/utils/thread_local.h
View file

@ -108,17 +108,23 @@ class ThreadLocal {
return data;
}
public:
ThreadLocal() :
ThreadLocal(T()) {}
ThreadLocal(const T &p_init_val) :
init_val(p_init_val) {
void _initialize(const T &p_init_val) {
init_val = p_init_val;
storage.alloc(&destr_callback);
}
ThreadLocal(const ThreadLocal &other) :
ThreadLocal(*other._tls_get_value()) {}
public:
ThreadLocal() {
_initialize(T());
}
ThreadLocal(const T &p_init_val) {
_initialize(p_init_val);
}
ThreadLocal(const ThreadLocal &other) {
_initialize(*other._tls_get_value());
}
~ThreadLocal() {
storage.free();