X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cxx.patch;fp=cxx.patch;h=0000000000000000000000000000000000000000;hb=d0515a20848240d2a7b81d546d427dd0e9a9b432;hp=aeed7b6b50b7d88ce0ea2d1184534fe8d8516c96;hpb=8f1e0c21a1ace8371ceb61105924b50bf2f0668e;p=packages%2Fvcmi.git

diff --git a/cxx.patch b/cxx.patch
deleted file mode 100644
index aeed7b6..0000000
--- a/cxx.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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
- 
- 	//type not found - add it to the list and return given ID
--	auto newType = make_shared<TypeDescriptor>();
-+	auto newType = std::make_shared<TypeDescriptor>();
- 	newType->typeID = typeInfos.size() + 1;
- 	newType->name = type->name();
- 	typeInfos[type] = newType;
---- 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 @@
- 			}
- 			else 
- 			{
--				installNewPlayerInterface(make_shared<CPlayerInterface>(color), color);
-+				installNewPlayerInterface(std::make_shared<CPlayerInterface>(color), color);
- 				humanPlayers++;
- 			}
- 		}
-@@ -467,7 +467,7 @@
- 		if(!gNoGUI)
- 		{
- 			boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);
--			auto p = make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);
-+			auto p = std::make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);
- 			p->observerInDuelMode = true;
- 			installNewPlayerInterface(p, boost::none);
- 			GH.curInt = p.get();
-@@ -550,7 +550,7 @@
- 			else
- 			{
- 				assert(isHuman);
--				nInt = make_shared<CPlayerInterface>(pid);
-+				nInt = std::make_shared<CPlayerInterface>(pid);
- 			}
- 
- 			nInt->dllName = dllname;
-@@ -620,7 +620,7 @@
- 			else
- 			{
- 				assert(isHuman);
--				nInt = make_shared<CPlayerInterface>(pid);
-+				nInt = std::make_shared<CPlayerInterface>(pid);
- 			}
- 
- 			nInt->dllName = dllname;
-@@ -866,7 +866,7 @@
- 	playerint[colorUsed] = gameInterface;
- 
- 	logGlobal->traceStream() << boost::format("\tInitializing the interface for player %s") % colorUsed;
--	auto cb = make_shared<CCallback>(gs, color, this);
-+	auto cb = std::make_shared<CCallback>(gs, color, this);
- 	callbacks[colorUsed] = cb;
- 	battleCallbacks[colorUsed] = cb;
- 	gameInterface->init(cb);
-@@ -887,7 +887,7 @@
- 	if(needCallback)
- 	{
- 		logGlobal->traceStream() << boost::format("\tInitializing the battle interface for player %s") % *color;
--		auto cbc = make_shared<CBattleCallback>(gs, color, this);
-+		auto cbc = std::make_shared<CBattleCallback>(gs, color, this);
- 		battleCallbacks[colorUsed] = cbc;
- 		battleInterface->init(cbc);
- 	}