mirror of
https://github.com/godotengine/godot
synced 2024-09-16 02:17:12 +00:00
Merge pull request #22653 from neikeq/mono-mod-fix-gcc-warnings
Fix GCC compiler warning in mono module
This commit is contained in:
commit
64962fe605
|
@ -2244,8 +2244,8 @@ void BindingsGenerator::_populate_global_constants() {
|
||||||
String constant_name = GlobalConstants::get_global_constant_name(i);
|
String constant_name = GlobalConstants::get_global_constant_name(i);
|
||||||
|
|
||||||
const DocData::ConstantDoc *const_doc = NULL;
|
const DocData::ConstantDoc *const_doc = NULL;
|
||||||
for (int i = 0; i < global_scope_doc.constants.size(); i++) {
|
for (int j = 0; j < global_scope_doc.constants.size(); j++) {
|
||||||
const DocData::ConstantDoc &curr_const_doc = global_scope_doc.constants[i];
|
const DocData::ConstantDoc &curr_const_doc = global_scope_doc.constants[j];
|
||||||
|
|
||||||
if (curr_const_doc.name == constant_name) {
|
if (curr_const_doc.name == constant_name) {
|
||||||
const_doc = &curr_const_doc;
|
const_doc = &curr_const_doc;
|
||||||
|
|
|
@ -475,14 +475,14 @@ void MonoBuildTab::_bind_methods() {
|
||||||
}
|
}
|
||||||
|
|
||||||
MonoBuildTab::MonoBuildTab(const MonoBuildInfo &p_build_info, const String &p_logs_dir) :
|
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),
|
build_exited(false),
|
||||||
issues_list(memnew(ItemList)),
|
issues_list(memnew(ItemList)),
|
||||||
error_count(0),
|
error_count(0),
|
||||||
warning_count(0),
|
warning_count(0),
|
||||||
errors_visible(true),
|
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->set_v_size_flags(SIZE_EXPAND_FILL);
|
||||||
issues_list->connect("item_activated", this, "_issue_activated");
|
issues_list->connect("item_activated", this, "_issue_activated");
|
||||||
add_child(issues_list);
|
add_child(issues_list);
|
||||||
|
|
|
@ -228,4 +228,4 @@ cleanup:
|
||||||
}
|
}
|
||||||
} // namespace MonoRegUtils
|
} // namespace MonoRegUtils
|
||||||
|
|
||||||
#endif WINDOWS_ENABLED
|
#endif // WINDOWS_ENABLED
|
||||||
|
|
|
@ -108,17 +108,23 @@ class ThreadLocal {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
void _initialize(const T &p_init_val) {
|
||||||
ThreadLocal() :
|
init_val = p_init_val;
|
||||||
ThreadLocal(T()) {}
|
|
||||||
|
|
||||||
ThreadLocal(const T &p_init_val) :
|
|
||||||
init_val(p_init_val) {
|
|
||||||
storage.alloc(&destr_callback);
|
storage.alloc(&destr_callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
ThreadLocal(const ThreadLocal &other) :
|
public:
|
||||||
ThreadLocal(*other._tls_get_value()) {}
|
ThreadLocal() {
|
||||||
|
_initialize(T());
|
||||||
|
}
|
||||||
|
|
||||||
|
ThreadLocal(const T &p_init_val) {
|
||||||
|
_initialize(p_init_val);
|
||||||
|
}
|
||||||
|
|
||||||
|
ThreadLocal(const ThreadLocal &other) {
|
||||||
|
_initialize(*other._tls_get_value());
|
||||||
|
}
|
||||||
|
|
||||||
~ThreadLocal() {
|
~ThreadLocal() {
|
||||||
storage.free();
|
storage.free();
|
||||||
|
|
Loading…
Reference in a new issue