Skip to content

Commit 095ae59

Browse files
xezontintinhamans
authored andcommitted
chore(refcountptr): Include ref_ptr.h in WWCommon.h (TheSuperHackers#3059)
1 parent f8c404e commit 095ae59

9 files changed

Lines changed: 3 additions & 10 deletions

File tree

‎Core/Libraries/Source/WWVegas/WWLib/WWCommon.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#pragma once
2020

21+
#include "ref_ptr.h"
2122
#include "refcount.h"
2223
#include "STLUtils.h"
2324
#include "stringex.h"

‎Generals/Code/GameEngine/Include/GameLogic/AI.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "Common/GameType.h"
3535
#include "GameLogic/Damage.h"
3636
#include "Common/STLTypedefs.h"
37-
#include "WWLib/ref_ptr.h"
3837

3938
class AIGroup;
4039
class AttackPriorityInfo;

‎Generals/Code/GameEngine/Include/GameLogic/Object.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#pragma once
3030

3131
#include "Lib/BaseType.h"
32-
#include "WWLib/ref_ptr.h"
3332

3433
#include "Common/Geometry.h"
3534
#include "Common/Snapshot.h"

‎Generals/Code/GameEngine/Source/Common/StateMachine.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#include "GameLogic/GameLogic.h"
3838
#include "GameLogic/Object.h"
3939

40-
#include "WWLib/ref_ptr.h"
41-
4240

4341
//------------------------------------------------------------------------------ Performance Timers
4442
//#include "Common/PerfMetrics.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
335335

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

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

‎GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include "Common/GameType.h"
3535
#include "GameLogic/Damage.h"
3636
#include "Common/STLTypedefs.h"
37-
#include "WWLib/ref_ptr.h"
3837

3938
class AIGroup;
4039
class AttackPriorityInfo;

‎GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#pragma once
3030

3131
#include "Lib/BaseType.h"
32-
#include "WWLib/ref_ptr.h"
3332

3433
#include "Common/Geometry.h"
3534
#include "Common/Snapshot.h"

‎GeneralsMD/Code/GameEngine/Source/Common/StateMachine.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#include "GameLogic/GameLogic.h"
3838
#include "GameLogic/Object.h"
3939

40-
#include "WWLib/ref_ptr.h"
41-
4240

4341
//------------------------------------------------------------------------------ Performance Timers
4442
//#include "Common/PerfMetrics.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static LRESULT CALLBACK tabControlPropertiesCallback( HWND hWndDialog,
335335

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

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

0 commit comments

Comments
 (0)