- rebuild with boost 1.61

[packages/vcmi.git] / cxx.patch

--- vcmi-0.98/lib/Connection.cpp~	2015-04-01 07:34:22.000000000 +0000
+++ vcmi-0.98/lib/Connection.cpp	2016-05-28 17:54:42.579831336 +0000
@@ -440,7 +440,7 @@
 		return typeDescr;  //type found, return ptr to structure\r
 \r
 	//type not found - add it to the list and return given ID\r
-	auto newType = make_shared<TypeDescriptor>();\r
+	auto newType = std::make_shared<TypeDescriptor>();\r
 	newType->typeID = typeInfos.size() + 1;\r
 	newType->name = type->name();\r
 	typeInfos[type] = newType;\r
--- vcmi-0.98/client/Client.cpp~	2015-04-01 07:34:22.000000000 +0000
+++ vcmi-0.98/client/Client.cpp	2016-05-28 18:01:35.421105201 +0000
@@ -451,7 +451,7 @@
 			}\r
 			else \r
 			{\r
-				installNewPlayerInterface(make_shared<CPlayerInterface>(color), color);\r
+				installNewPlayerInterface(std::make_shared<CPlayerInterface>(color), color);\r
 				humanPlayers++;\r
 			}\r
 		}\r
@@ -467,7 +467,7 @@
 		if(!gNoGUI)\r
 		{\r
 			boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);\r
-			auto p = make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);\r
+			auto p = std::make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);\r
 			p->observerInDuelMode = true;\r
 			installNewPlayerInterface(p, boost::none);\r
 			GH.curInt = p.get();\r
@@ -550,7 +550,7 @@
 			else\r
 			{\r
 				assert(isHuman);\r
-				nInt = make_shared<CPlayerInterface>(pid);\r
+				nInt = std::make_shared<CPlayerInterface>(pid);\r
 			}\r
 \r
 			nInt->dllName = dllname;\r
@@ -620,7 +620,7 @@
 			else\r
 			{\r
 				assert(isHuman);\r
-				nInt = make_shared<CPlayerInterface>(pid);\r
+				nInt = std::make_shared<CPlayerInterface>(pid);\r
 			}\r
 \r
 			nInt->dllName = dllname;\r
@@ -866,7 +866,7 @@
 	playerint[colorUsed] = gameInterface;\r
 \r
 	logGlobal->traceStream() << boost::format("\tInitializing the interface for player %s") % colorUsed;\r
-	auto cb = make_shared<CCallback>(gs, color, this);\r
+	auto cb = std::make_shared<CCallback>(gs, color, this);\r
 	callbacks[colorUsed] = cb;\r
 	battleCallbacks[colorUsed] = cb;\r
 	gameInterface->init(cb);\r
@@ -887,7 +887,7 @@
 	if(needCallback)\r
 	{\r
 		logGlobal->traceStream() << boost::format("\tInitializing the battle interface for player %s") % *color;\r
-		auto cbc = make_shared<CBattleCallback>(gs, color, this);\r
+		auto cbc = std::make_shared<CBattleCallback>(gs, color, this);\r
 		battleCallbacks[colorUsed] = cbc;\r
 		battleInterface->init(cbc);\r
 	}\r