Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 2 deletions

diff --git a/core/cpu_caps.cpp b/core/cpu_caps.cpp
index d4b4d86c..1a064cf4 100644
--- a/core/cpu_caps.cpp
+++ b/core/cpu_caps.cpp
@@ -17,6 +17,7 @@
 #include <intrin.h>
 #endif
 
+#include <algorithm>
 #include <array>
 #include <cctype>
 #include <string>
@@ -50,14 +51,14 @@ inline std::array<reg_type,4> get_cpuid(unsigned int f)
 
 } // namespace
 
-al::optional<CPUInfo> GetCPUInfo()
+std::optional<CPUInfo> GetCPUInfo()
 {
     CPUInfo ret;
 
 #ifdef CAN_GET_CPUID
     auto cpuregs = get_cpuid(0);
     if(cpuregs[0] == 0)
-        return al::nullopt;
+        return std::nullopt;
 
     const reg_type maxfunc{cpuregs[0]};