diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 21:39:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 21:39:04 +0200 |
| commit | 40c3c8745df3d08065802762e236beeaa6aa1345 (patch) | |
| tree | 24307e256b9c6cd973e5332b4b5b1959f1a10419 /core | |
| parent | dea0f69296f248d3294bdf11bd77eba212ce7d6c (diff) | |
| parent | 2091f204432d58f20a642bf9fab83a6d08a65084 (diff) | |
Merge pull request #22516 from akien-mga/fix-warnings
Fix warnings about wrong member initialization order [-Wreorder]
Diffstat (limited to 'core')
| -rw-r--r-- | core/object.cpp | 2 | ||||
| -rw-r--r-- | core/object.h | 4 | ||||
| -rw-r--r-- | core/script_debugger_remote.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/object.cpp b/core/object.cpp index 96914fe141..86d9fbde20 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -277,8 +277,8 @@ MethodInfo::MethodInfo(Variant::Type ret, const String &p_name, const PropertyIn MethodInfo::MethodInfo(const PropertyInfo &p_ret, const String &p_name) : name(p_name), - flags(METHOD_FLAG_NORMAL), return_val(p_ret), + flags(METHOD_FLAG_NORMAL), id(0) { } diff --git a/core/object.h b/core/object.h index be405a47a6..0825aac301 100644 --- a/core/object.h +++ b/core/object.h @@ -187,11 +187,11 @@ Array convert_property_list(const List<PropertyInfo> *p_list); struct MethodInfo { String name; - List<PropertyInfo> arguments; - Vector<Variant> default_arguments; PropertyInfo return_val; uint32_t flags; int id; + List<PropertyInfo> arguments; + Vector<Variant> default_arguments; inline bool operator==(const MethodInfo &p_method) const { return id == p_method.id; } inline bool operator<(const MethodInfo &p_method) const { return id == p_method.id ? (name < p_method.name) : (id < p_method.id); } diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index fe1dc2cdd1..00a86d11bd 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -1094,12 +1094,12 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() : performance(Engine::get_singleton()->get_singleton_object("Performance")), requested_quit(false), mutex(Mutex::create()), - max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")), max_messages_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_messages_per_frame")), - max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")), - char_count(0), n_messages_dropped(0), + max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")), n_errors_dropped(0), + max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")), + char_count(0), last_msec(0), msec_count(0), allow_focus_steal_pid(0), |