[Client] Fix build by changing boost::shared_ptr into std::shared_ptr

pull/249/merge
David Cernat 8 years ago
parent fa3baac0f3
commit c6aee3b780

@ -978,7 +978,7 @@ namespace MWClass
Don't display a dialogue screen for two players interacting with each other Don't display a dialogue screen for two players interacting with each other
*/ */
if (actor == MWMechanics::getPlayer() && mwmp::PlayerList::isDedicatedPlayer(ptr)) if (actor == MWMechanics::getPlayer() && mwmp::PlayerList::isDedicatedPlayer(ptr))
return boost::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("Not implemented.")); return std::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("Not implemented."));
/* /*
End of tes3mp addition End of tes3mp addition
*/ */

@ -248,7 +248,7 @@ void DedicatedActor::equipItem(std::string refId, int charge)
{ {
if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), refId) && it->getCellRef().getCharge() == charge) if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), refId) && it->getCellRef().getCharge() == charge)
{ {
boost::shared_ptr<MWWorld::Action> action = it->getClass().use(*it); std::shared_ptr<MWWorld::Action> action = it->getClass().use(*it);
action->execute(ptr); action->execute(ptr);
break; break;
} }

@ -194,7 +194,7 @@ void DedicatedPlayer::setEquipment()
{ {
if (::Misc::StringUtils::ciEqual(it2->getCellRef().getRefId(), dedicItem)) // equip item if (::Misc::StringUtils::ciEqual(it2->getCellRef().getRefId(), dedicItem)) // equip item
{ {
boost::shared_ptr<MWWorld::Action> action = it2->getClass().use(*it2); std::shared_ptr<MWWorld::Action> action = it2->getClass().use(*it2);
action->execute(ptr); action->execute(ptr);
break; break;
} }

@ -54,5 +54,5 @@ void ActorProcessor::AddProcessor(mwmp::ActorProcessor *processor)
throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " + throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " +
processor->className + " and " + p.second->className); processor->className + " and " + p.second->className);
} }
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<ActorProcessor>(processor))); processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr<ActorProcessor>(processor)));
} }

@ -25,7 +25,7 @@ namespace mwmp
static bool Process(RakNet::Packet &packet, ActorList &actorList); static bool Process(RakNet::Packet &packet, ActorList &actorList);
static void AddProcessor(ActorProcessor *processor); static void AddProcessor(ActorProcessor *processor);
typedef boost::unordered_map<unsigned char, boost::shared_ptr<ActorProcessor> > processors_t; typedef boost::unordered_map<unsigned char, std::shared_ptr<ActorProcessor> > processors_t;
private: private:
static processors_t processors; static processors_t processors;

@ -19,7 +19,7 @@ void PlayerProcessor::AddProcessor(PlayerProcessor *processor)
throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " + throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " +
processor->className + " and " + p.second->className); processor->className + " and " + p.second->className);
} }
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<PlayerProcessor>(processor))); processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr<PlayerProcessor>(processor)));
} }
bool PlayerProcessor::Process(RakNet::Packet &packet) bool PlayerProcessor::Process(RakNet::Packet &packet)

@ -26,7 +26,7 @@ namespace mwmp
static bool Process(RakNet::Packet &packet); static bool Process(RakNet::Packet &packet);
static void AddProcessor(PlayerProcessor *processor); static void AddProcessor(PlayerProcessor *processor);
typedef boost::unordered_map<unsigned char, boost::shared_ptr<PlayerProcessor> > processors_t; typedef boost::unordered_map<unsigned char, std::shared_ptr<PlayerProcessor> > processors_t;
//typedef std::unordered_map<unsigned char, std::unique_ptr<PlayerProcessor> > processors_t; //typedef std::unordered_map<unsigned char, std::unique_ptr<PlayerProcessor> > processors_t;
private: private:
static processors_t processors; static processors_t processors;

@ -54,5 +54,5 @@ void WorldProcessor::AddProcessor(mwmp::WorldProcessor *processor)
throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " + throw std::logic_error("processor " + p.second->strPacketID + " already registered. Check " +
processor->className + " and " + p.second->className); processor->className + " and " + p.second->className);
} }
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<WorldProcessor>(processor))); processors.insert(processors_t::value_type(processor->GetPacketID(), std::shared_ptr<WorldProcessor>(processor)));
} }

@ -26,7 +26,7 @@ namespace mwmp
static bool Process(RakNet::Packet &packet, WorldEvent &event); static bool Process(RakNet::Packet &packet, WorldEvent &event);
static void AddProcessor(WorldProcessor *processor); static void AddProcessor(WorldProcessor *processor);
typedef boost::unordered_map<unsigned char, boost::shared_ptr<WorldProcessor> > processors_t; typedef boost::unordered_map<unsigned char, std::shared_ptr<WorldProcessor> > processors_t;
private: private:
static processors_t processors; static processors_t processors;

Loading…
Cancel
Save