bugfix(bitflags): Replace unqualified min() with inline ternary operator #2177
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
i686-w64-mingw32-gcc build broke with commit d38f692. Inline ternary works for all builds. Changes: - Replace min(m_bits.size(), sizeof(val) * 8) with inline ternary operator - Avoids dependency on <algorithm> or always.h - Fixes both Generals and GeneralsMD BitFlags.h files This resolves: - MinGW-w64 GCC 14 error: 'min' was not declared in this scope - VC6 error: syntax error : '::' if using std::min - MSVC error: '(' : illegal token on right side of '::' if using std::min Root cause analysis: - Original code used unqualified min() expecting always.h's template - BitFlags.h doesn't include always.h (it's in WWVegas, not GameEngine) - VC6's <algorithm> doesn't have std::min (only min_element) - VC6's <minmax.h> has min() macro, but NOMINMAX disables it - Inline ternary is simple, portable, and VC6-compatible
JohnsterID
force-pushed
the
bugfix/bitflags-std-min
branch
from
0bc32e1 to
2121bf2
Compare
xezon
reviewed
Jan 24, 2026
| { | ||
| UnsignedInt val = 0; | ||
| const UnsignedInt count = min(m_bits.size(), sizeof(val) * 8); | ||
| const UnsignedInt count = (m_bits.size() < sizeof(val) * 8) ? m_bits.size() : sizeof(val) * 8; |
There was a problem hiding this comment.
Instead, what do we need to do to get min into this file?
The new code is harder to read.
There was a problem hiding this comment.
I agree.
If it is an issue that min() cannot be found, then there should be imho a macro for it in the case of minGW.
xezon
added
Minor
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
i686-w64-mingw32-gcc build broke with commit d38f692. Inline ternary works for all builds.
Changes:
This resolves:
Root cause analysis: