diff --git a/Minecraft.Client/Level/MultiPlayerLevel.h b/Minecraft.Client/Level/MultiPlayerLevel.h index 84f4d9527..78c99747b 100644 --- a/Minecraft.Client/Level/MultiPlayerLevel.h +++ b/Minecraft.Client/Level/MultiPlayerLevel.h @@ -55,8 +55,8 @@ public: private: std::unordered_map, IntKeyHash2, IntKeyEq> entitiesById; // 4J - was IntHashMap - unordered_set > forced; - unordered_set > reEntries; + std::unordered_set > forced; + std::unordered_set > reEntries; public: virtual bool addEntity(std::shared_ptr e); @@ -82,7 +82,7 @@ protected: public: void animateTickDoWork(); // 4J added - unordered_set chunksToAnimate; // 4J added + std::unordered_set chunksToAnimate; // 4J added public: void removeAllPendingEntityRemovals(); diff --git a/Minecraft.Client/Level/ServerLevel.h b/Minecraft.Client/Level/ServerLevel.h index b0beea260..3d9a0f780 100644 --- a/Minecraft.Client/Level/ServerLevel.h +++ b/Minecraft.Client/Level/ServerLevel.h @@ -19,7 +19,7 @@ private: CRITICAL_SECTION m_tickNextTickCS; // 4J added set tickNextTickList; // 4J Was TreeSet - unordered_set tickNextTickSet; // 4J Was HashSet + std::unordered_set tickNextTickSet; // 4J Was HashSet std::vector m_queuedSendTileUpdates; // 4J added CRITICAL_SECTION m_csQueueSendTileUpdates; diff --git a/Minecraft.Client/Network/ServerChunkCache.h b/Minecraft.Client/Network/ServerChunkCache.h index 331805a1d..5490502bf 100644 --- a/Minecraft.Client/Network/ServerChunkCache.h +++ b/Minecraft.Client/Network/ServerChunkCache.h @@ -12,7 +12,7 @@ class ServerChunkCache : public ChunkSource { private: -// unordered_set toDrop; +// std::unordered_set toDrop; private: LevelChunk *emptyChunk; ChunkSource *source; diff --git a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp index 63c5c7853..f2dfb21b6 100644 --- a/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp +++ b/Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp @@ -717,7 +717,7 @@ bool SQRNetworkManager_Orbis::FriendRoomManagerSearch2() if( m_aFriendSearchResults.size() > 0 ) { // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. - unordered_set uniqueRooms; + std::unordered_set uniqueRooms; for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ ) { if(m_aFriendSearchResults[i].m_RoomFound) diff --git a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp index 5ca3129af..de803b0c8 100644 --- a/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp +++ b/Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp @@ -592,7 +592,7 @@ bool SQRNetworkManager_PS3::FriendRoomManagerSearch2() if( m_searchResultCount ) { // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. - unordered_set uniqueRooms; + std::unordered_set uniqueRooms; for( unsigned int i = 0; i < m_searchResultCount; i++ ) { if(m_aSearchResultRoomFound[ i ]) diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp index 1cc1b63d1..8f11ec8e3 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp @@ -723,7 +723,7 @@ bool SQRNetworkManager_AdHoc_Vita::FriendRoomManagerSearch2() // if( m_aFriendSearchResults.size() > 0 ) // { // // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. -// unordered_set uniqueRooms; +// std::unordered_set uniqueRooms; // for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ ) // { // if(m_aFriendSearchResults[i].m_RoomFound) diff --git a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp index 3cb16bfd8..794d57b09 100644 --- a/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp +++ b/Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp @@ -631,7 +631,7 @@ bool SQRNetworkManager_Vita::FriendRoomManagerSearch2() if( m_aFriendSearchResults.size() > 0 ) { // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. - unordered_set uniqueRooms; + std::unordered_set uniqueRooms; for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ ) { if(m_aFriendSearchResults[i].m_RoomFound) diff --git a/Minecraft.Client/Player/EntityTracker.h b/Minecraft.Client/Player/EntityTracker.h index 57ca99be0..a98f20ad8 100644 --- a/Minecraft.Client/Player/EntityTracker.h +++ b/Minecraft.Client/Player/EntityTracker.h @@ -13,7 +13,7 @@ class EntityTracker { private: ServerLevel *level; - unordered_set > entities; + std::unordered_set > entities; std::unordered_map , IntKeyHash2, IntKeyEq> entityMap; // was IntHashMap int maxRange; diff --git a/Minecraft.Client/Player/ServerPlayer.h b/Minecraft.Client/Player/ServerPlayer.h index 8abb871f2..bb2ad5b74 100644 --- a/Minecraft.Client/Player/ServerPlayer.h +++ b/Minecraft.Client/Player/ServerPlayer.h @@ -23,7 +23,7 @@ public: double lastMoveX, lastMoveZ; list chunksToSend; std::vector entitiesToRemove; - unordered_set seenChunks; + std::unordered_set seenChunks; int spewTimer; // 4J-Added, for 'Adventure Time' achievement. diff --git a/Minecraft.Client/Player/TrackedEntity.h b/Minecraft.Client/Player/TrackedEntity.h index 81e69cc5f..805cbf167 100644 --- a/Minecraft.Client/Player/TrackedEntity.h +++ b/Minecraft.Client/Player/TrackedEntity.h @@ -32,7 +32,7 @@ private: public: bool moved; - unordered_set , PlayerKeyHash, PlayerKeyEq > seenBy; + std::unordered_set , PlayerKeyHash, PlayerKeyEq > seenBy; TrackedEntity(std::shared_ptr e, int range, int updateInterval, bool trackDelta); diff --git a/Minecraft.Client/Rendering/Chunk.cpp b/Minecraft.Client/Rendering/Chunk.cpp index f94b0b880..d077d794a 100644 --- a/Minecraft.Client/Rendering/Chunk.cpp +++ b/Minecraft.Client/Rendering/Chunk.cpp @@ -204,7 +204,7 @@ void Chunk::rebuild() LevelChunk::touchedSky = false; -// unordered_set > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line +// std::unordered_set > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line // renderableTileEntities.clear(); std::vector > renderableTileEntities; // 4J - added @@ -554,10 +554,10 @@ void Chunk::rebuild() */ - unordered_set > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); + std::unordered_set > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); AUTO_VAR(endIt, oldTileEntities.end()); - for( unordered_set >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) + for( std::unordered_set >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) { newTileEntities.erase(*it); } @@ -566,7 +566,7 @@ void Chunk::rebuild() EnterCriticalSection(globalRenderableTileEntities_cs); endIt = newTileEntities.end(); - for( unordered_set >::iterator it = newTileEntities.begin(); it != endIt; it++ ) + for( std::unordered_set >::iterator it = newTileEntities.begin(); it != endIt; it++ ) { globalRenderableTileEntities->push_back(*it); } @@ -656,7 +656,7 @@ void Chunk::rebuild_SPU() LevelChunk::touchedSky = false; -// unordered_set > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line +// std::unordered_set > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line // renderableTileEntities.clear(); std::vector > renderableTileEntities; // 4J - added @@ -883,10 +883,10 @@ void Chunk::rebuild_SPU() */ - unordered_set > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); + std::unordered_set > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); AUTO_VAR(endIt, oldTileEntities.end()); - for( unordered_set >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) + for( std::unordered_set >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) { newTileEntities.erase(*it); } @@ -895,7 +895,7 @@ void Chunk::rebuild_SPU() EnterCriticalSection(globalRenderableTileEntities_cs); endIt = newTileEntities.end(); - for( unordered_set >::iterator it = newTileEntities.begin(); it != endIt; it++ ) + for( std::unordered_set >::iterator it = newTileEntities.begin(); it != endIt; it++ ) { globalRenderableTileEntities.push_back(*it); } diff --git a/Minecraft.World/Blocks/RedStoneDustTile.h b/Minecraft.World/Blocks/RedStoneDustTile.h index 12a1bca64..236907f67 100644 --- a/Minecraft.World/Blocks/RedStoneDustTile.h +++ b/Minecraft.World/Blocks/RedStoneDustTile.h @@ -17,7 +17,7 @@ public: static const std::wstring TEXTURE_LINE_OVERLAY; private: bool shouldSignal; - unordered_set toUpdate; + std::unordered_set toUpdate; Icon *iconCross; Icon *iconLine; Icon *iconCrossOver; diff --git a/Minecraft.World/Commands/CommandDispatcher.h b/Minecraft.World/Commands/CommandDispatcher.h index 2a706fbff..4b8ed3cf9 100644 --- a/Minecraft.World/Commands/CommandDispatcher.h +++ b/Minecraft.World/Commands/CommandDispatcher.h @@ -11,7 +11,7 @@ private: #else std::unordered_map commandsById; #endif - unordered_set commands; + std::unordered_set commands; public: void performCommand(std::shared_ptr sender, EGameCommand command, byteArray commandData); diff --git a/Minecraft.World/Containers/AbstractContainerMenu.h b/Minecraft.World/Containers/AbstractContainerMenu.h index f38e5c402..306a895ee 100644 --- a/Minecraft.World/Containers/AbstractContainerMenu.h +++ b/Minecraft.World/Containers/AbstractContainerMenu.h @@ -68,7 +68,7 @@ public: short backup(std::shared_ptr inventory); private: - unordered_set , PlayerKeyHash, PlayerKeyEq> unSynchedPlayers; + std::unordered_set , PlayerKeyHash, PlayerKeyEq> unSynchedPlayers; public: bool isSynched(std::shared_ptr player); diff --git a/Minecraft.World/Level/Explosion.h b/Minecraft.World/Level/Explosion.h index 52be76a19..ca1cb3357 100644 --- a/Minecraft.World/Level/Explosion.h +++ b/Minecraft.World/Level/Explosion.h @@ -22,7 +22,7 @@ public: std::shared_ptr source; float r; - unordered_set toBlow; + std::unordered_set toBlow; private: typedef std::unordered_map, Vec3 * , PlayerKeyHash, PlayerKeyEq> playerVec3Map; diff --git a/Minecraft.World/Level/Level.h b/Minecraft.World/Level/Level.h index e94d19c20..19be720a6 100644 --- a/Minecraft.World/Level/Level.h +++ b/Minecraft.World/Level/Level.h @@ -380,7 +380,7 @@ protected: // AP - See CustomSet.h for an explanation of this CustomSet chunksToPoll; #else - unordered_set chunksToPoll; + std::unordered_set chunksToPoll; #endif private: diff --git a/Minecraft.World/Network/Packets/ExplodePacket.cpp b/Minecraft.World/Network/Packets/ExplodePacket.cpp index f3cf69e30..ec38684a2 100644 --- a/Minecraft.World/Network/Packets/ExplodePacket.cpp +++ b/Minecraft.World/Network/Packets/ExplodePacket.cpp @@ -19,7 +19,7 @@ ExplodePacket::ExplodePacket() knockbackZ = 0.0f; } -ExplodePacket::ExplodePacket(double x, double y, double z, float r, unordered_set *toBlow, Vec3 *knockback, bool knockBackOnly) +ExplodePacket::ExplodePacket(double x, double y, double z, float r, std::unordered_set *toBlow, Vec3 *knockback, bool knockBackOnly) { this->x = x; this->y = y; diff --git a/Minecraft.World/Network/Packets/ExplodePacket.h b/Minecraft.World/Network/Packets/ExplodePacket.h index 8416e22a1..d8264d509 100644 --- a/Minecraft.World/Network/Packets/ExplodePacket.h +++ b/Minecraft.World/Network/Packets/ExplodePacket.h @@ -20,7 +20,7 @@ public: public: ExplodePacket(); - ExplodePacket(double x, double y, double z, float r, unordered_set *toBlow, Vec3 *knockback, bool knockBackOnly); + ExplodePacket(double x, double y, double z, float r, std::unordered_set *toBlow, Vec3 *knockback, bool knockBackOnly); virtual void read(DataInputStream *dis); virtual void write(DataOutputStream *dos); diff --git a/Minecraft.World/Network/Packets/Packet.cpp b/Minecraft.World/Network/Packets/Packet.cpp index 431c4834c..0ff351a9c 100644 --- a/Minecraft.World/Network/Packets/Packet.cpp +++ b/Minecraft.World/Network/Packets/Packet.cpp @@ -165,9 +165,9 @@ Packet::Packet() : createTime( System::currentTimeMillis() ) std::unordered_map Packet::idToCreateMap; -unordered_set Packet::clientReceivedPackets = unordered_set(); -unordered_set Packet::serverReceivedPackets = unordered_set(); -unordered_set Packet::sendToAnyClientPackets = unordered_set(); +std::unordered_set Packet::clientReceivedPackets = std::unordered_set(); +std::unordered_set Packet::serverReceivedPackets = std::unordered_set(); +std::unordered_set Packet::sendToAnyClientPackets = std::unordered_set(); // 4J Added std::unordered_map Packet::outgoingStatistics = std::unordered_map(); diff --git a/Minecraft.World/Network/Packets/Packet.h b/Minecraft.World/Network/Packets/Packet.h index eefc2cbf9..41f3a5e0b 100644 --- a/Minecraft.World/Network/Packets/Packet.h +++ b/Minecraft.World/Network/Packets/Packet.h @@ -49,9 +49,9 @@ public: public: static std::unordered_map idToCreateMap; // IntHashMap in 1.8.2 ... needed? // Made public in 1.0.1 - static unordered_set clientReceivedPackets; - static unordered_set serverReceivedPackets; - static unordered_set sendToAnyClientPackets; + static std::unordered_set clientReceivedPackets; + static std::unordered_set serverReceivedPackets; + static std::unordered_set sendToAnyClientPackets; // 4J Stu - Added the sendToAnyClient param so we can limit some packets to be only sent to one player on a system // 4J Stu - Added renderStats param for use in debugging diff --git a/Minecraft.World/Util/StringHelpers.h b/Minecraft.World/Util/StringHelpers.h index 439e3bda6..ec901af17 100644 --- a/Minecraft.World/Util/StringHelpers.h +++ b/Minecraft.World/Util/StringHelpers.h @@ -28,7 +28,7 @@ template T _fromHEXString(const std::wstring& s) return t; } -std::wstring convStringToWstring(const string& converting); +std::wstring convStringToWstring(const std::string& converting); const char *wstringtofilename(const std::wstring& name); std::wstring filenametowstring(const char *name);