From c6aee3b780445e4f504311bb8a936998648c4597 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sun, 18 Jun 2017 19:36:06 +0300 Subject: [PATCH] [Client] Fix build by changing boost::shared_ptr into std::shared_ptr --- apps/openmw/mwclass/npc.cpp | 2 +- apps/openmw/mwmp/DedicatedActor.cpp | 2 +- apps/openmw/mwmp/DedicatedPlayer.cpp | 2 +- apps/openmw/mwmp/processors/ActorProcessor.cpp | 2 +- apps/openmw/mwmp/processors/ActorProcessor.hpp | 2 +- apps/openmw/mwmp/processors/PlayerProcessor.cpp | 2 +- apps/openmw/mwmp/processors/PlayerProcessor.hpp | 2 +- apps/openmw/mwmp/processors/WorldProcessor.cpp | 2 +- apps/openmw/mwmp/processors/WorldProcessor.hpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index 40b98b331..9a2fd31e7 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/apps/openmw/mwclass/npc.cpp @@ -978,7 +978,7 @@ namespace MWClass Don't display a dialogue screen for two players interacting with each other */ if (actor == MWMechanics::getPlayer() && mwmp::PlayerList::isDedicatedPlayer(ptr)) - return boost::shared_ptr(new MWWorld::FailedAction("Not implemented.")); + return std::shared_ptr(new MWWorld::FailedAction("Not implemented.")); /* End of tes3mp addition */ diff --git a/apps/openmw/mwmp/DedicatedActor.cpp b/apps/openmw/mwmp/DedicatedActor.cpp index c76747a15..95470346c 100644 --- a/apps/openmw/mwmp/DedicatedActor.cpp +++ b/apps/openmw/mwmp/DedicatedActor.cpp @@ -248,7 +248,7 @@ void DedicatedActor::equipItem(std::string refId, int charge) { if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), refId) && it->getCellRef().getCharge() == charge) { - boost::shared_ptr action = it->getClass().use(*it); + std::shared_ptr action = it->getClass().use(*it); action->execute(ptr); break; } diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp index ff210b27f..9c1cd1b92 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.cpp +++ b/apps/openmw/mwmp/DedicatedPlayer.cpp @@ -194,7 +194,7 @@ void DedicatedPlayer::setEquipment() { if (::Misc::StringUtils::ciEqual(it2->getCellRef().getRefId(), dedicItem)) // equip item { - boost::shared_ptr action = it2->getClass().use(*it2); + std::shared_ptr action = it2->getClass().use(*it2); action->execute(ptr); break; } diff --git a/apps/openmw/mwmp/processors/ActorProcessor.cpp b/apps/openmw/mwmp/processors/ActorProcessor.cpp index 84f0b875d..66498f501 100644 --- a/apps/openmw/mwmp/processors/ActorProcessor.cpp +++ b/apps/openmw/mwmp/processors/ActorProcessor.cpp @@ -54,5 +54,5 @@ void ActorProcessor::AddProcessor(mwmp::ActorProcessor *processor) throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " + processor->className + " and " + p.second->className); } - processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr(processor))); + processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr(processor))); } diff --git a/apps/openmw/mwmp/processors/ActorProcessor.hpp b/apps/openmw/mwmp/processors/ActorProcessor.hpp index c88c400d2..9209c1914 100644 --- a/apps/openmw/mwmp/processors/ActorProcessor.hpp +++ b/apps/openmw/mwmp/processors/ActorProcessor.hpp @@ -25,7 +25,7 @@ namespace mwmp static bool Process(RakNet::Packet &packet, ActorList &actorList); static void AddProcessor(ActorProcessor *processor); - typedef boost::unordered_map > processors_t; + typedef boost::unordered_map > processors_t; private: static processors_t processors; diff --git a/apps/openmw/mwmp/processors/PlayerProcessor.cpp b/apps/openmw/mwmp/processors/PlayerProcessor.cpp index c8a7768f5..796e2d77d 100644 --- a/apps/openmw/mwmp/processors/PlayerProcessor.cpp +++ b/apps/openmw/mwmp/processors/PlayerProcessor.cpp @@ -19,7 +19,7 @@ void PlayerProcessor::AddProcessor(PlayerProcessor *processor) throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " + processor->className + " and " + p.second->className); } - processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr(processor))); + processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr(processor))); } bool PlayerProcessor::Process(RakNet::Packet &packet) diff --git a/apps/openmw/mwmp/processors/PlayerProcessor.hpp b/apps/openmw/mwmp/processors/PlayerProcessor.hpp index 8d674bba2..bc4661875 100644 --- a/apps/openmw/mwmp/processors/PlayerProcessor.hpp +++ b/apps/openmw/mwmp/processors/PlayerProcessor.hpp @@ -26,7 +26,7 @@ namespace mwmp static bool Process(RakNet::Packet &packet); static void AddProcessor(PlayerProcessor *processor); - typedef boost::unordered_map > processors_t; + typedef boost::unordered_map > processors_t; //typedef std::unordered_map > processors_t; private: static processors_t processors; diff --git a/apps/openmw/mwmp/processors/WorldProcessor.cpp b/apps/openmw/mwmp/processors/WorldProcessor.cpp index 7c61c5d3e..07f6e6783 100644 --- a/apps/openmw/mwmp/processors/WorldProcessor.cpp +++ b/apps/openmw/mwmp/processors/WorldProcessor.cpp @@ -54,5 +54,5 @@ void WorldProcessor::AddProcessor(mwmp::WorldProcessor *processor) throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " + processor->className + " and " + p.second->className); } - processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr(processor))); + processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr(processor))); } diff --git a/apps/openmw/mwmp/processors/WorldProcessor.hpp b/apps/openmw/mwmp/processors/WorldProcessor.hpp index 3710e8be4..f12f4bf4d 100644 --- a/apps/openmw/mwmp/processors/WorldProcessor.hpp +++ b/apps/openmw/mwmp/processors/WorldProcessor.hpp @@ -26,7 +26,7 @@ namespace mwmp static bool Process(RakNet::Packet &packet, WorldEvent &event); static void AddProcessor(WorldProcessor *processor); - typedef boost::unordered_map > processors_t; + typedef boost::unordered_map > processors_t; private: static processors_t processors;