games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
client/NetPacksClient.cpp
View File

@ -701,7 +701,7 @@ void BattleAttack::applyCl(CClient *cl)
void StartAction::applyFirstCl(CClient *cl)
{
cl->curbaction = ba;
cl->curbaction = boost::make_optional(ba);
BATTLE_INTERFACE_CALL_IF_PRESENT_FOR_BOTH_SIDES(actionStarted, ba);
}