Skip to content

Commit 1444641

Browse files
committed
fix(build): Cast NUM_TAB_PANES to Int in min/max to resolve template ambiguity
1 parent ea2411c commit 1444641

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
334334
tabData->tabEdge = TP_BOTTOM_SIDE;
335335

336336
//safeties
337-
tabData->tabCount = max( tabData->tabCount, 1 );
338-
tabData->tabCount = min( tabData->tabCount, NUM_TAB_PANES );
337+
tabData->tabCount = max( tabData->tabCount, (Int)1 );
338+
tabData->tabCount = min( tabData->tabCount, (Int)NUM_TAB_PANES );
339339

340340
GadgetTabControlComputeTabRegion( tabControl );
341341
GadgetTabControlResizeSubPanes( tabControl );

GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/TabControlProperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
334334
tabData->tabEdge = TP_BOTTOM_SIDE;
335335

336336
//safeties
337-
tabData->tabCount = max( tabData->tabCount, 1 );
338-
tabData->tabCount = min( tabData->tabCount, NUM_TAB_PANES );
337+
tabData->tabCount = max( tabData->tabCount, (Int)1 );
338+
tabData->tabCount = min( tabData->tabCount, (Int)NUM_TAB_PANES );
339339

340340
GadgetTabControlComputeTabRegion( tabControl );
341341
GadgetTabControlResizeSubPanes( tabControl );

0 commit comments

Comments
 (0)