Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overlay_win: Fix "m_active" variable order #2932

Merged

Conversation

@davidebeatrici
Copy link
Member

commented Mar 12, 2017

Fixes:

Overlay_win.h:51:8: error: 'OverlayPrivateWin::m_active' will be initialized after [-Werror=reorder]
   bool m_active;
        ^
Overlay_win.h:41:8: error:   'bool OverlayPrivateWin::m_helper_enabled' [-Werror=reorder]
   bool m_helper_enabled;
        ^
Overlay_win.cpp:49:1: error:   when initialized here [-Werror=reorder]
 OverlayPrivateWin::OverlayPrivateWin(QObject *p)
 ^
@mkrautz
Copy link
Member

left a comment

Please stop putting compiler output in your commit messages, and just explain what we're fixing instead, and why.

In this case, please just re-order the initialization list instead. (In Overlay_win.cpp.)

@davidebeatrici davidebeatrici force-pushed the davidebeatrici:Overlay_win_variables-order branch from 490a0dd to a7a1bcb Mar 13, 2017

@mkrautz

This comment has been minimized.

Copy link
Member

commented Mar 14, 2017

@davidebeatrici Commit does not match the description :-)
You need to change the order of initialization in
https://github.com/mumble-voip/mumble/blob/b3f2833/src/mumble/Overlay_win.cpp#L50-L54
They need to match the order in the header.

Overlay_win: Fix "m_active" variable order
This commit re-orders the variables initialization list.

@davidebeatrici davidebeatrici force-pushed the davidebeatrici:Overlay_win_variables-order branch from a7a1bcb to e284bcc Mar 14, 2017

@mkrautz mkrautz merged commit 2667fe4 into mumble-voip:master Mar 14, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.