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

#include & compiler warning fixes #276

merged 10 commits into from Mar 29, 2019


Copy link

commented Mar 26, 2019

This fixes compilation issues related to the Qt headers / includes.

By reducing unnecessary Qt includes, and fixing up include order, a number of other missing C++ STL includes and compiler warnings were revealed (and fixed / handled).

In particular, many .cpp files were apparently relying on side-effects of Qt includes, and missing things like #include <algorithm>.

@past-due past-due force-pushed the past-due:2019_03_25_qt_cleanup_fixes branch 2 times, most recently from 03d6535 to 173e6f0 Mar 27, 2019

@past-due past-due added this to the 3.3.0_beta2 milestone Mar 27, 2019

past-due added 10 commits Mar 25, 2019
[MSVC] Fix: Do not define `inline` in C++ mode
...\VC\Tools\MSVC\14.16.27023\include\xkeycheck.h(207): error C4005: 'inline': macro redefinition
    ...\warzone2100\lib\framework\wzglobal.h(577): note: see previous definition of 'inline'
...\VC\Tools\MSVC\14.16.27023\include\xkeycheck.h(260): fatal error C1189: #error:  The C++ Standard Library forbids macroizing keywords. Enable warning C4005 to find the forbidden macro.

@past-due past-due force-pushed the past-due:2019_03_25_qt_cleanup_fixes branch from 173e6f0 to 727569e Mar 28, 2019

@past-due past-due merged commit 8df5237 into Warzone2100:master Mar 29, 2019

8 checks passed

LGTM analysis: C/C++ No new or fixed alerts
LGTM analysis: JavaScript No code changes detected
LGTM analysis: Python No code changes detected
WIP Ready for review
continuous-integration/appveyor/pr AppVeyor build succeeded
continuous-integration/travis-ci/pr The Travis CI build passed
freebsd_build FreeBSD:freebsd-11-2-release-amd64 Task Summary
freebsd_build FreeBSD:freebsd-12-0-release-amd64 Task Summary
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
1 participant
You can’t perform that action at this time.