From d5f29d134feed60ab56e9295457dd7cd2e0469ac Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sun, 26 Aug 2012 13:16:57 +0000 Subject: [PATCH] - create temporary when INFINITE_DIST passed by reference. Should work with MSVC as well :) --- lib/CBattleCallback.cpp | 5 +---- lib/CBattleCallback.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/CBattleCallback.cpp b/lib/CBattleCallback.cpp index 15187c078..77fd98c8f 100644 --- a/lib/CBattleCallback.cpp +++ b/lib/CBattleCallback.cpp @@ -8,9 +8,6 @@ #define RETURN_IF_NOT_BATTLE(X) if(!duringBattle()) {tlog1 << __FUNCTION__ << " called when no battle!\n"; return X; } -//allocate static member -//const int ReachabilityInfo::INFINITE_DIST; - namespace SiegeStuffThatShouldBeMovedToHandlers // <=== TODO { static int lineToWallHex(int line) //returns hex with wall in given line (y coordinate) @@ -1089,7 +1086,7 @@ ReachabilityInfo CBattleInfoCallback::makeBFS(const AccessibilityInfo &accessibi ret.params = params; ret.predecessors.fill(BattleHex::INVALID); - ret.distances.fill(ReachabilityInfo::INFINITE_DIST); + ret.distances.fill(static_cast(ReachabilityInfo::INFINITE_DIST)); const std::set quicksands = getStoppers(params.perspective); //const bool twoHexCreature = params.doubleWide; diff --git a/lib/CBattleCallback.h b/lib/CBattleCallback.h index 6460f25da..404638489 100644 --- a/lib/CBattleCallback.h +++ b/lib/CBattleCallback.h @@ -128,7 +128,7 @@ struct DLL_LINKAGE ReachabilityInfo ReachabilityInfo() { - distances.fill(INFINITE_DIST); + distances.fill(static_cast(INFINITE_DIST)); predecessors.fill(BattleHex::INVALID); }