fix(basetype): Add min max templates to BaseType.h #2183
+48
−4
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
…yer (TheSuperHackers#2183) Add lowercase min/max template functions to BaseType.h alongside existing uppercase MIN/MAX macros from BaseTypeCore.h. Problem: BitFlags.h and other GameEngine code needed readable min() calls, but VC6's <algorithm> lacks std::min/std::max. GameEngine code cannot rely on always.h (WWVegas layer). Solution: Add min/max templates to BaseType.h with header guard to prevent conflicts when GameEngine code includes both BaseType.h and WWVegas headers (which also define min/max in always.h). Implementation: - Use same header guard as always.h (_MIN_MAX_TEMPLATES_DEFINED_) - Templates coexist with uppercase MIN/MAX macros - Works with VC6, MSVC, and MinGW-w64 - Follows existing BaseType.h pattern (sqr, clamp, sign templates) Architecture note: GameEngine intentionally depends on WWVegas (declared in CMakeLists.txt). When GameEngine includes WW3D headers, always.h is transitively included. Header guard prevents duplicate definitions.
…SuperHackers#2183) Replace uppercase MIN/MAX macros with new lowercase min/max templates in RealRange::combine() for better type safety and readability. This demonstrates usage of the templates added in the previous commit and provides a concrete example of improved code clarity.
JohnsterID
force-pushed
the
feature/basetype-min-max-templates
branch
from
d1190eb to
f9072af
Compare
|
I have a change coming soon for moving BaseType.h to Core, so this will need to wait for a moment. |
Author
|
Moving it to Core would be good. I'll wait out. |
xezon
changed the title
xezon
added
CompileBug
xezon
approved these changes
Jan 25, 2026
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
Looks good. Finalize and Merge after moving BaseType.h to Core.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixes: #2177 (closes the ternary operator workaround PR)
Alternative to: Ternary operator approach (less readable)
Adds lowercase
min/maxtemplate functions to BaseType.h for GameEngine layer, providing readable alternatives to uppercase MIN/MAX macros and ternary operators.Both BaseType.h and always.h provide min/max independently:
BaseType.h → GameEngine code that doesn't need WW3D
always.h → WWVegas/WW3D code
MinGW-w64 locally tested and CI tested: https://github.com/JohnsterID/GeneralsGameCode/actions/runs/21322546177
TODO