games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared

Browse Source 
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.

This change wouldn't break anything because there was already code with prefix for each of three cases.
This commit is contained in:
Arseniy Shestakov
2015-12-29 05:43:33 +03:00
parent 29a7934a99
commit 9fd1cff090
73 changed files with 257 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.h
View File

@@ -258,9 +258,9 @@ public:
struct FinishingBattleHelper
{
FinishingBattleHelper();
FinishingBattleHelper(shared_ptr<const CBattleQuery> Query, bool Duel, int RemainingBattleQueriesCount);
FinishingBattleHelper(std::shared_ptr<const CBattleQuery> Query, bool Duel, int RemainingBattleQueriesCount);
//shared_ptr<const CBattleQuery> query;
//std::shared_ptr<const CBattleQuery> query;
const CGHeroInstance *winnerHero, *loserHero;
PlayerColor victor, loser;
bool duel;
@@ -273,7 +273,7 @@ public:
}
};
unique_ptr<FinishingBattleHelper> finishingBattle;
std::unique_ptr<FinishingBattleHelper> finishingBattle;
void battleAfterLevelUp(const BattleResult &result);