Restore removed <algorithm> includes.

Turns out these were needed after all. For some reason, on Windows and
Mac, <algorithm> gets auto-included by something else so I don't notice
when it's missing, and MSVC's include dependency tracker doesn't see it
either.

Common/CPUDetect.cpp

@@ -35,6 +35,7 @@
 #include <cstdint>
 #include <memory.h>
 #include <set>
+#include <algorithm>
 
 #include "Common/Common.h"
 #include "Common/CPUDetect.h"

Common/Data/Encoding/Utf8.cpp

@@ -22,7 +22,7 @@
 #include <cstring>
 #include <cstdarg>
 #include <cstdint>
-
+#include <algorithm>
 #include <string>
 
 #include "Common/Data/Encoding/Utf8.h"

Common/GPU/Vulkan/VulkanImage.cpp

@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "Common/Log.h"
 #include "Common/GPU/Vulkan/VulkanContext.h"
 #include "Common/GPU/Vulkan/VulkanAlloc.h"

Common/GPU/Vulkan/VulkanImage.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include "VulkanLoader.h"
 
 class VulkanContext;

Common/GPU/Vulkan/VulkanMemory.cpp

@@ -18,14 +18,11 @@
 // Additionally, Common/Vulkan/* , including this file, are also licensed
 // under the public domain.
 
-#include <set>
-#include <mutex>
-
+#include <algorithm>
 #include "Common/Math/math_util.h"
 
 #include "Common/Log.h"
 #include "Common/TimeUtil.h"
-#include "Common/Math/math_util.h"
 #include "Common/GPU/Vulkan/VulkanMemory.h"
 #include "Common/Data/Text/Parsers.h"
 

Common/Render/DrawBuffer.cpp

@@ -1,5 +1,6 @@
 #include <cmath>
 #include <vector>
+#include <algorithm>
 #include <stddef.h>
 
 #include "Common/System/Display.h"
@@ -578,7 +579,7 @@ void DrawBuffer::DrawTextRect(FontID font, std::string_view text, float x, float
 	float totalWidth, totalHeight;
 	MeasureTextRect(font, toDraw, Bounds(x, y, w, h), &totalWidth, &totalHeight, align);
 
-	std::vector<std::string> lines;
+	std::vector<std::string_view> lines;
 	SplitString(toDraw, '\n', lines);
 
 	float baseY = y;
@@ -591,7 +592,7 @@ void DrawBuffer::DrawTextRect(FontID font, std::string_view text, float x, float
 	}
 
 	// This allows each line to be horizontally centered by itself.
-	for (const std::string &line : lines) {
+	for (std::string_view line : lines) {
 		DrawText(font, line, x, baseY, color, align);
 
 		float tw, th;

Core/Debugger/MemBlockInfo.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <atomic>
 #include <cstring>
 #include <mutex>

Core/Dialog/PSPGamedataInstallDialog.cpp

@@ -15,10 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include "Common/CommonTypes.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
-#include "Common/System/OSD.h"
 #include "Core/ELF/ParamSFO.h"
 #include "Core/MemMapHelpers.h"
 #include "Core/Reporting.h"

Core/Dialog/PSPMsgDialog.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/StringUtils.h"

Core/Dialog/PSPNetconfDialog.cpp

@@ -15,7 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "Common/CommonWindows.h"
+#include <algorithm>
 #include "Common/TimeUtil.h"
 #include "Common/Data/Text/I18n.h"
 #include "Common/Serialize/Serializer.h"

Core/Dialog/PSPNpSigninDialog.cpp

@@ -15,9 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#if defined(_WIN32)
-#include "Common/CommonWindows.h"
-#endif
+#include <algorithm>
 #include "Common/TimeUtil.h"
 #include "Common/Data/Text/I18n.h"
 #include "Common/Serialize/Serializer.h"

Core/Dialog/PSPOskDialog.cpp

@@ -16,6 +16,10 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "ppsspp_config.h"
+
+#include <cctype>
+#include <cmath>
+#include <algorithm>
 #include "Common/Data/Text/I18n.h"
 #include "Common/Math/math_util.h"
 #include "Common/Data/Encoding/Utf8.h"
@@ -31,11 +35,6 @@
 #include "Core/Config.h"
 #include "Core/Reporting.h"
 
-#ifndef _WIN32
-#include <ctype.h>
-#include <math.h>
-#endif
-
 // These are rough, it seems to take a long time to init, and probably depends on threads.
 // TODO: This takes like 700ms on a PSP but that's annoyingly long.
 const static int OSK_INIT_DELAY_US = 300000;

Core/Dialog/PSPSaveDialog.cpp

@@ -22,6 +22,8 @@
 #endif
 #endif
 
+
+#include <algorithm>
 #include <thread>
 
 #include "Common/Data/Encoding/Utf8.h"

Core/Dialog/SavedataParam.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <memory>
 #include "Common/Log.h"
 #include "Common/Data/Text/I18n.h"

Core/FileLoaders/CachingFileLoader.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <cstring>
 #include <thread>
 

Core/FileLoaders/DiskCachingFileLoader.cpp

@@ -17,6 +17,7 @@
 
 #include "ppsspp_config.h"
 
+#include <algorithm>
 #include <cstddef>
 #include <set>
 #include <mutex>

Core/FileLoaders/RamCachingFileLoader.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <thread>
 #include <cstring>
 

Core/FileSystems/BlockDevices.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <cstring>
 
 #include "Common/Data/Text/I18n.h"

Core/FileSystems/ISOFileSystem.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <cstring>
 #include <cstdio>
 

Core/Font/PGF.cpp

@@ -20,6 +20,7 @@
 // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code.
 // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3.
 
+#include <algorithm>
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Core/MemMap.h"

Core/HLE/ReplaceTables.cpp

@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "ppsspp_config.h"
+
+#include <algorithm>
 #include <map>
 #include <unordered_map>
 

Core/HW/MemoryStick.cpp

@@ -15,6 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <string_view>
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/File/DiskFree.h"

Core/HW/StereoResampler.cpp

@@ -33,6 +33,7 @@
 #define CONTROL_AVG     32.0f
 
 #include "ppsspp_config.h"
+#include <algorithm>
 #include <cstring>
 #include <atomic>
 

Core/MemMap.cpp

@@ -21,6 +21,7 @@
 #include "Common/CommonWindows.h"
 #endif
 
+#include <algorithm>
 #include <mutex>
 
 #include "Common/CommonTypes.h"

Core/RetroAchievements.cpp

@@ -12,7 +12,7 @@
 // md5_hash(PSP_GAME/EBOOT.BIN)
 // hash = md5_finalize()
 
-#include <functional>
+#include <algorithm>
 #include <set>
 #include <string>
 #include <vector>

Core/Screenshot.cpp

@@ -17,6 +17,8 @@
 
 #include "ppsspp_config.h"
 
+#include <algorithm>
+
 #include <png.h>
 #include "ext/jpge/jpge.h"
 

GPU/Common/GPUStateUtils.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "ppsspp_config.h"
+#include <algorithm>
 #include <limits>
 
 #include "Core/ConfigValues.h"

GPU/Common/PresentationCommon.cpp

@@ -15,10 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <cmath>
 #include <set>
 #include <cstdint>
-
 #include "Common/GPU/thin3d.h"
 
 #include "Common/System/Display.h"

GPU/Common/SoftwareTransformCommon.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <cmath>
 
 #include "Common/CPUDetect.h"

GPU/Common/TextureScalerCommon.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. 
 
+#include <algorithm>
 #include <cstddef>
 #include <cstring>
 #include <cmath>

GPU/Common/TextureShaderCommon.cpp

@@ -15,7 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include <map>
+#include <vector>
+#include <string>
 
 #include "Common/StringUtils.h"
 #include "GPU/GPUState.h"

GPU/Common/VertexDecoderCommon.cpp

@@ -17,6 +17,10 @@
 
 #include "ppsspp_config.h"
 
+#include <algorithm>
+#include <vector>
+#include <string>
+
 #include "Common/CommonTypes.h"
 #include "Common/Data/Convert/ColorConv.h"
 #include "Common/Log.h"

GPU/D3D11/StateMappingD3D11.cpp

@@ -18,6 +18,7 @@
 #include <d3d11.h>
 #include <d3d11_1.h>
 
+#include <algorithm>
 
 #include "Common/Data/Convert/SmallDataConvert.h"
 

Windows/Debugger/CtrlDisAsmView.h

@@ -14,8 +14,11 @@
 // To get a class instance to be able to access it, just use 
 //   CtrlDisAsmView::getFrom(GetDlgItem(yourdialog, IDC_yourid)).
 
+#include <algorithm>
 #include <vector>
+#include <string>
 #include <set>
+#include <map>
 
 #include "Common/CommonWindows.h"
 #include "Common/Log.h"