diff options
Diffstat (limited to 'source/game/StarSystemWorldServerThread.cpp')
| -rw-r--r-- | source/game/StarSystemWorldServerThread.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/StarSystemWorldServerThread.cpp b/source/game/StarSystemWorldServerThread.cpp index fb5cea5..4586889 100644 --- a/source/game/StarSystemWorldServerThread.cpp +++ b/source/game/StarSystemWorldServerThread.cpp @@ -7,7 +7,7 @@ namespace Star { SystemWorldServerThread::SystemWorldServerThread(Vec3I const& location, SystemWorldServerPtr systemWorld, String storageFile) : Thread(strf("SystemWorldServer: {}", location)), m_stop(false), m_storageFile(storageFile) { m_systemLocation = location; - m_systemWorld = move(systemWorld); + m_systemWorld = std::move(systemWorld); } SystemWorldServerThread::~SystemWorldServerThread() { @@ -45,7 +45,7 @@ void SystemWorldServerThread::removeClient(ConnectionId clientId) { } void SystemWorldServerThread::setPause(shared_ptr<const atomic<bool>> pause) { - m_pause = move(pause); + m_pause = std::move(pause); } void SystemWorldServerThread::run() { @@ -125,7 +125,7 @@ void SystemWorldServerThread::setClientDestination(ConnectionId clientId, System void SystemWorldServerThread::executeClientShipAction(ConnectionId clientId, ClientShipAction action) { WriteLocker locker(m_queueMutex); - m_clientShipActions.append({clientId, move(action)}); + m_clientShipActions.append({clientId, std::move(action)}); } SystemLocation SystemWorldServerThread::clientShipLocation(ConnectionId clientId) { @@ -158,7 +158,7 @@ void SystemWorldServerThread::setUpdateAction(function<void(SystemWorldServerThr void SystemWorldServerThread::pushIncomingPacket(ConnectionId clientId, PacketPtr packet) { WriteLocker locker(m_queueMutex); - m_incomingPacketQueue.append({move(clientId), move(packet)}); + m_incomingPacketQueue.append({std::move(clientId), std::move(packet)}); } List<PacketPtr> SystemWorldServerThread::pullOutgoingPackets(ConnectionId clientId) { |