diff --git a/Minecraft.Client/Build/Common/DLC/DLCPack.cpp b/Minecraft.Client/Build/Common/DLC/DLCPack.cpp index 91e857bae..bf6be031b 100644 --- a/Minecraft.Client/Build/Common/DLC/DLCPack.cpp +++ b/Minecraft.Client/Build/Common/DLC/DLCPack.cpp @@ -268,7 +268,7 @@ bool DLCPack::doesPackContainFile(DLCManager::EDLCType type, const std::wstring else { g_pathCmpString = &path; - AUTO_VAR(it, find_if( m_files[type].begin(), m_files[type].end(), pathCmp )); + AUTO_VAR(it, std::find_if( m_files[type].begin(), m_files[type].end(), pathCmp )); hasFile = it != m_files[type].end(); if(!hasFile && m_parentPack ) { @@ -314,7 +314,7 @@ DLCFile *DLCPack::getFile(DLCManager::EDLCType type, const std::wstring &path) else { g_pathCmpString = &path; - AUTO_VAR(it, find_if( m_files[type].begin(), m_files[type].end(), pathCmp )); + AUTO_VAR(it, std::find_if( m_files[type].begin(), m_files[type].end(), pathCmp )); if(it == m_files[type].end()) { diff --git a/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp b/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp index 4b29016a0..e20b6f19b 100644 --- a/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp +++ b/Minecraft.Client/Build/Common/UI/UIBitmapFont.cpp @@ -286,7 +286,7 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte }; static long long lastPrint = System::currentTimeMillis(); - static unordered_set debug_fontSizesRequested; + static std::unordered_set debug_fontSizesRequested; { DebugData dData = { m_cFontData->getFontName(), (long) pixel_scale, (long) glyphScale }; @@ -296,7 +296,7 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte { app.DebugPrintf(" Requested font/sizes:\n"); - unordered_set::iterator itr; + std::unordered_set::iterator itr; for ( itr = debug_fontSizesRequested.begin(); itr != debug_fontSizesRequested.end(); itr++ diff --git a/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h b/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h index 86043d046..df3d3b611 100644 --- a/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h +++ b/Minecraft.Client/Platform/Durango/Network/DQRNetworkManager.h @@ -509,7 +509,7 @@ private: int m_sessionResultCount; bool m_cancelJoinFromSearchResult; - map m_displayNames; // Player display names by gamertag + std::map m_displayNames; // Player display names by gamertag