Skip to content

fix(basetype): Add min max templates to BaseType.h #2183

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.

Sign up for GitHub

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

Open
JohnsterID wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(basetype): Add min max templates to BaseType.h #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c056673
refactor(basetype): Add lowercase min/max templates for GameEngine la…
JohnsterID Jan 24, 2026
f9072af
refactor(basetype): Use lowercase min/max templates in RealRange (#2183)
JohnsterID Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions Generals/Code/Libraries/Include/Lib/BaseType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,28 @@ inline int sign(NUM x)
else return 0;
}

// TheSuperHackers @refactor JohnsterID 24/01/2026 Add lowercase min/max templates for GameEngine layer.
// GameEngine code typically uses BaseType.h, but may include WWVegas headers (which define min/max in always.h).
// Header guard prevents duplicate definitions. VC6's <algorithm> lacks std::min/std::max.
#ifndef _MIN_MAX_TEMPLATES_DEFINED_
#define _MIN_MAX_TEMPLATES_DEFINED_

#ifdef min
#undef min
#endif

#ifdef max
#undef max
#endif

template <typename T>
inline T min(T a, T b) { return (a < b) ? a : b; }

template <typename T>
inline T max(T a, T b) { return (a > b) ? a : b; }

#endif // _MIN_MAX_TEMPLATES_DEFINED_

//-----------------------------------------------------------------------------
inline Real rad2deg(Real rad) { return rad * (180/PI); }
inline Real deg2rad(Real rad) { return rad * (PI/180); }
Expand Down Expand Up @@ -174,8 +196,8 @@ struct RealRange
// both ranges
void combine( RealRange &other )
{
lo = MIN( lo, other.lo );
hi = MAX( hi, other.hi );
lo = min( lo, other.lo );
hi = max( hi, other.hi );
}
};

Expand Down
26 changes: 24 additions & 2 deletions GeneralsMD/Code/Libraries/Include/Lib/BaseType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,28 @@ inline int sign(NUM x)
else return 0;
}

// TheSuperHackers @refactor JohnsterID 24/01/2026 Add lowercase min/max templates for GameEngine layer.
// GameEngine code typically uses BaseType.h, but may include WWVegas headers (which define min/max in always.h).
// Header guard prevents duplicate definitions. VC6's <algorithm> lacks std::min/std::max.
#ifndef _MIN_MAX_TEMPLATES_DEFINED_
#define _MIN_MAX_TEMPLATES_DEFINED_

#ifdef min
#undef min
#endif

#ifdef max
#undef max
#endif

template <typename T>
inline T min(T a, T b) { return (a < b) ? a : b; }

template <typename T>
inline T max(T a, T b) { return (a > b) ? a : b; }

#endif // _MIN_MAX_TEMPLATES_DEFINED_

//-----------------------------------------------------------------------------
inline Real rad2deg(Real rad) { return rad * (180/PI); }
inline Real deg2rad(Real rad) { return rad * (PI/180); }
Expand Down Expand Up @@ -174,8 +196,8 @@ struct RealRange
// both ranges
void combine( RealRange &other )
{
lo = MIN( lo, other.lo );
hi = MAX( hi, other.hi );
lo = min( lo, other.lo );
hi = max( hi, other.hi );
}
};

Expand Down
Loading