The Future is Now: __cpp_lib_concepts

Replaces "Common/Future/CppLibConcepts.h" with <concepts>
dolphin-emu · Apr 14, 2023 · 3304db9 · 3304db9
1 parent a735128
commit 3304db9
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 73 deletions.
diff --git a/Source/Core/Common/Align.h b/Source/Core/Common/Align.h
@@ -2,10 +2,9 @@
 
 #pragma once
 
+#include <concepts>
 #include <cstddef>
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace Common
 {
 template <std::unsigned_integral T>

diff --git a/Source/Core/Common/BitSet.h b/Source/Core/Common/BitSet.h
@@ -3,14 +3,13 @@
 #pragma once
 
 #include <bit>
+#include <concepts>
 #include <cstddef>
 #include <initializer_list>
 #include <type_traits>
 
 #include "Common/CommonTypes.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace Common
 {
 // Similar to std::bitset, this is a class which encapsulates a bitset, i.e.

diff --git a/Source/Core/Common/BitUtils.h b/Source/Core/Common/BitUtils.h
@@ -5,6 +5,7 @@
 
 #include <array>
 #include <climits>
+#include <concepts>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
@@ -13,8 +14,6 @@
 
 #include "Common/Concepts.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace Common
 {
 ///

diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
@@ -59,7 +59,6 @@ add_library(common
   FloatUtils.h
   FormatUtil.h
   FPURoundMode.h
-  Future/CppLibConcepts.h
   GekkoDisassembler.cpp
   GekkoDisassembler.h
   Hash.cpp

diff --git a/Source/Core/Common/Concepts.h b/Source/Core/Common/Concepts.h
@@ -2,13 +2,12 @@
 
 #pragma once
 
+#include <concepts>
 #include <cstddef>
 #include <type_traits>
 
 #include "Common/TypeUtils.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace Common
 {
 template <class T>

diff --git a/Source/Core/Common/Future/CppLibConcepts.h b/Source/Core/Common/Future/CppLibConcepts.h
diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h
@@ -6,14 +6,13 @@
 #include <algorithm>
 #include <bit>
 #include <cmath>
+#include <concepts>
 #include <limits>
 #include <type_traits>
 #include <vector>
 
 #include "Common/CommonTypes.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace MathUtil
 {
 constexpr double TAU = 6.2831853071795865;

diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <concepts>
 #include <cstdarg>
 #include <cstddef>
 #include <cstdlib>
@@ -18,8 +19,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Concepts.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 std::string StringFromFormatV(const char* format, va_list args);
 
 std::string StringFromFormat(const char* format, ...)

diff --git a/Source/Core/Core/HLE/HLE_VarArgs.h b/Source/Core/Core/HLE/HLE_VarArgs.h
@@ -10,10 +10,9 @@
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PowerPC.h"
 
+#include <concepts>
 #include <type_traits>
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace Core
 {
 class CPUThreadGuard;

diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h
@@ -5,6 +5,7 @@
 
 #include <array>
 #include <atomic>
+#include <concepts>
 #include <string>
 #include <tuple>
 
@@ -17,8 +18,6 @@
 #include "Core/HW/MMIOHandlers.h"
 #include "Core/System.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace MMIO
 {
 // There are three main MMIO blocks on the Wii (only one on the GameCube):

diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
@@ -26,6 +26,7 @@
 #include "Core/PowerPC/MMU.h"
 
 #include <bit>
+#include <concepts>
 #include <cstddef>
 #include <cstring>
 #include <string>
@@ -50,8 +51,6 @@
 
 #include "VideoCommon/VideoBackendBase.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace PowerPC
 {
 MMU::MMU(Core::System& system, Memory::MemoryManager& memory, PowerPC::PowerPCManager& power_pc)

diff --git a/Source/Core/Core/PowerPC/MMU.h b/Source/Core/Core/PowerPC/MMU.h
@@ -4,15 +4,14 @@
 #pragma once
 
 #include <array>
+#include <concepts>
 #include <cstddef>
 #include <optional>
 #include <string>
 
 #include "Common/BitField.h"
 #include "Common/CommonTypes.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace Core
 {
 class CPUThreadGuard;

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cmath>
+#include <concepts>
 #include <memory>
 #include <mutex>
 #include <string>
@@ -18,8 +19,6 @@
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerInterface/CoreDevice.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 class ControllerInterface;
 
 constexpr const char* DIRECTION_UP = _trans("Up");

diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.cpp
@@ -7,8 +7,6 @@
 #include "Common/StringUtil.h"
 #include "VideoCommon/TextureCacheBase.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace
 {
 template <std::derived_from<FBTarget> T>

diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <concepts>
+
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/EnumFormatter.h"
@@ -11,8 +13,6 @@
 #include "VideoCommon/CPMemory.h"
 #include "VideoCommon/VertexLoaderBase.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 struct CPState;
 class DataReader;
 

diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -4,6 +4,7 @@
 #include "VideoCommon/VertexLoader_Normal.h"
 
 #include <array>
+#include <concepts>
 #include <type_traits>
 
 #include "Common/CommonTypes.h"
@@ -13,8 +14,6 @@
 #include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexLoaderUtils.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 // warning: mapping buffer should be disabled to use this
 #define LOG_NORM()  // PRIM_LOG("norm: {} {} {}, ", ((float*)g_vertex_manager_write_ptr)[-3],
                     // ((float*)g_vertex_manager_write_ptr)[-2],

diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -3,6 +3,7 @@
 
 #include "VideoCommon/VertexLoader_Position.h"
 
+#include <concepts>
 #include <limits>
 
 #include "Common/CommonTypes.h"
@@ -14,8 +15,6 @@
 #include "VideoCommon/VertexLoaderUtils.h"
 #include "VideoCommon/VideoCommon.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace
 {
 template <typename T>

diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
@@ -3,15 +3,15 @@
 
 #include "VideoCommon/VertexLoader_TextCoord.h"
 
+#include <concepts>
+
 #include "Common/CommonTypes.h"
 #include "Common/Swap.h"
 
 #include "VideoCommon/VertexLoader.h"
 #include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexLoaderUtils.h"
 
-#include "Common/Future/CppLibConcepts.h"
-
 namespace
 {
 void TexCoord_Read_Dummy(VertexLoader* loader)