boost-1.58.patch

   1 From aa00fdbd0e99b2beec382c7677a64d962b748dcb Mon Sep 17 00:00:00 2001
   2 From: Rohit Nirmal <rohitnirmal9@gmail.com>
   3 Date: Wed, 6 May 2015 19:16:51 -0500
   4 Subject: [PATCH] Fix building with Boost 1.58.
   5
   6 ---
   7  CCallback.cpp             | 2 +-
   8  lib/CArtHandler.cpp       | 2 +-
   9  lib/CGameInfoCallback.cpp | 2 +-
  10  3 files changed, 3 insertions(+), 3 deletions(-)
  11
  12 diff --git a/CCallback.cpp b/CCallback.cpp
  13 index 8009bc7..da280db 100644
  14 --- a/CCallback.cpp
  15 +++ b/CCallback.cpp
  16 @@ -80,7 +80,7 @@ void CCallback::recruitCreatures(const CGDwelling *obj, const CArmedInstance * d
  17  \r
  18  bool CCallback::dismissCreature(const CArmedInstance *obj, SlotID stackPos)\r
  19  {\r
  20 -       if(((player>=0)  &&  obj->tempOwner != player) || (obj->stacksCount()<2  && obj->needsLastStack()))\r
  21 +       if((player && obj->tempOwner != player) || (obj->stacksCount()<2  && obj->needsLastStack()))\r
  22                 return false;\r
  23  \r
  24         DisbandCreature pack(stackPos,obj->id);\r
  25 diff --git a/lib/CArtHandler.cpp b/lib/CArtHandler.cpp
  26 index 2d9dd01..0026a66 100644
  27 --- a/lib/CArtHandler.cpp
  28 +++ b/lib/CArtHandler.cpp
  29 @@ -671,7 +671,7 @@ boost::optional<std::vector<CArtifact*>&> CArtHandler::listFromClass( CArtifact:
  30         case CArtifact::ART_RELIC:\r
  31                 return relics;\r
  32         default: //special artifacts should not be erased\r
  33 -               return nullptr;\r
  34 +               return boost::optional<std::vector<CArtifact*>&>();\r
  35         }\r
  36  }\r
  37  \r
  38 diff --git a/lib/CGameInfoCallback.cpp b/lib/CGameInfoCallback.cpp
  39 index 051bb9c..2a59b96 100644
  40 --- a/lib/CGameInfoCallback.cpp
  41 +++ b/lib/CGameInfoCallback.cpp
  42 @@ -403,7 +403,7 @@ std::vector <const CGObjectInstance * > CGameInfoCallback::getVisitableObjs(int3
  43
  44         for(const CGObjectInstance * obj : t->visitableObjects)
  45         {
  46 -               if(player < nullptr || obj->ID != Obj::EVENT) //hide events from players
  47 +               if(player || obj->ID != Obj::EVENT) //hide events from players
  48                         ret.push_back(obj);
  49         }
  50