1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00

Avoid boost::optional assignment for Boost 1.64 compatibility (#360)

Two options here: to use emplace from 1.56 or boost::make_optional.
Unfortunately Ubuntu 14.04 is using 1.54 and I'd rather not to break it.
This commit is contained in:
ArseniyShestakov
2017-08-05 16:09:29 +03:00
committed by GitHub
parent 4388e12a3a
commit cb40c093f8
12 changed files with 21 additions and 19 deletions

View File

@ -1146,7 +1146,8 @@ DLL_LINKAGE void NewTurn::applyGs(CGameState *gs)
{
if (playerState.daysWithoutCastle)
++(*playerState.daysWithoutCastle);
else playerState.daysWithoutCastle = 0;
else
playerState.daysWithoutCastle = boost::make_optional(0);
}
else
{