cxx.patch

   1 --- vcmi-0.98/lib/Connection.cpp~       2015-04-01 07:34:22.000000000 +0000
   2 +++ vcmi-0.98/lib/Connection.cpp        2016-05-28 17:54:42.579831336 +0000
   3 @@ -440,7 +440,7 @@
   4                 return typeDescr;  //type found, return ptr to structure\r
   5  \r
   6         //type not found - add it to the list and return given ID\r
   7 -       auto newType = make_shared<TypeDescriptor>();\r
   8 +       auto newType = std::make_shared<TypeDescriptor>();\r
   9         newType->typeID = typeInfos.size() + 1;\r
  10         newType->name = type->name();\r
  11         typeInfos[type] = newType;\r
  12 --- vcmi-0.98/client/Client.cpp~        2015-04-01 07:34:22.000000000 +0000
  13 +++ vcmi-0.98/client/Client.cpp 2016-05-28 18:01:35.421105201 +0000
  14 @@ -451,7 +451,7 @@
  15                         }\r
  16                         else \r
  17                         {\r
  18 -                               installNewPlayerInterface(make_shared<CPlayerInterface>(color), color);\r
  19 +                               installNewPlayerInterface(std::make_shared<CPlayerInterface>(color), color);\r
  20                                 humanPlayers++;\r
  21                         }\r
  22                 }\r
  23 @@ -467,7 +467,7 @@
  24                 if(!gNoGUI)\r
  25                 {\r
  26                         boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);\r
  27 -                       auto p = make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);\r
  28 +                       auto p = std::make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);\r
  29                         p->observerInDuelMode = true;\r
  30                         installNewPlayerInterface(p, boost::none);\r
  31                         GH.curInt = p.get();\r
  32 @@ -550,7 +550,7 @@
  33                         else\r
  34                         {\r
  35                                 assert(isHuman);\r
  36 -                               nInt = make_shared<CPlayerInterface>(pid);\r
  37 +                               nInt = std::make_shared<CPlayerInterface>(pid);\r
  38                         }\r
  39  \r
  40                         nInt->dllName = dllname;\r
  41 @@ -620,7 +620,7 @@
  42                         else\r
  43                         {\r
  44                                 assert(isHuman);\r
  45 -                               nInt = make_shared<CPlayerInterface>(pid);\r
  46 +                               nInt = std::make_shared<CPlayerInterface>(pid);\r
  47                         }\r
  48  \r
  49                         nInt->dllName = dllname;\r
  50 @@ -866,7 +866,7 @@
  51         playerint[colorUsed] = gameInterface;\r
  52  \r
  53         logGlobal->traceStream() << boost::format("\tInitializing the interface for player %s") % colorUsed;\r
  54 -       auto cb = make_shared<CCallback>(gs, color, this);\r
  55 +       auto cb = std::make_shared<CCallback>(gs, color, this);\r
  56         callbacks[colorUsed] = cb;\r
  57         battleCallbacks[colorUsed] = cb;\r
  58         gameInterface->init(cb);\r
  59 @@ -887,7 +887,7 @@
  60         if(needCallback)\r
  61         {\r
  62                 logGlobal->traceStream() << boost::format("\tInitializing the battle interface for player %s") % *color;\r
  63 -               auto cbc = make_shared<CBattleCallback>(gs, color, this);\r
  64 +               auto cbc = std::make_shared<CBattleCallback>(gs, color, this);\r
  65                 battleCallbacks[colorUsed] = cbc;\r
  66                 battleInterface->init(cbc);\r
  67         }\r