Migrate to C++20

Author: Segfaultd

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0091 NEW)
 
 project(Framework CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(FW_STANDALONE true)
 

cmake/FrameworkSetup.cmake

@@ -1,4 +1,4 @@
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/bin)
@@ -30,5 +30,5 @@ if(UNIX OR APPLE)
         -Wno-invalid-offsetof
     )
     add_compile_options(${DISABLED_WARNS})
-    set(CMAKE_CXX_FLAGS "-std=c++20 ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 endif()

code/framework/CMakeLists.txt

@@ -233,7 +233,7 @@ target_compile_definitions(FrameworkNodeEngine PRIVATE NODE_WANT_INTERNALS=1)
 
 # Match Framework compile definitions and features
 target_compile_definitions(FrameworkNodeEngine PRIVATE MG_ENABLE_LOG=0)
-target_compile_features(FrameworkNodeEngine PRIVATE cxx_std_17)
+target_compile_features(FrameworkNodeEngine PRIVATE cxx_std_20)
 
 # Link the solutions based on the platform
 link_shared_deps(Framework)

code/framework/src/external/imgui/wrapper.cpp

@@ -100,7 +100,7 @@ namespace Framework::External::ImGUI {
     }
 
     Error Wrapper::Update() {
-        std::lock_guard _lock(_renderMtx);
+        std::scoped_lock _lock(_renderMtx);
 
         switch (_config.renderBackend) {
         case Graphics::RendererBackend::BACKEND_D3D_9: {
@@ -135,7 +135,7 @@ namespace Framework::External::ImGUI {
     }
 
     Error Wrapper::Render() {
-        std::lock_guard _lock(_renderMtx);
+        std::scoped_lock _lock(_renderMtx);
 
         if (!isContextInitialized) {
             return Error::IMGUI_NOT_INITIALIZED;

code/framework/src/graphics/backend/d3d11.cpp

@@ -337,7 +337,7 @@ namespace Framework::Graphics {
     void D3D11Backend::CreateGeometry(uint32_t geometry_id, const VertexBuffer &vertices, const IndexBuffer &indices) {
         BindVertexLayout(vertices.format);
 
-        if (_geometry.find(geometry_id) != _geometry.end())
+        if (_geometry.contains(geometry_id))
             return;
 
         GeometryEntry geometry;

code/framework/src/gui/backend/view_d3d11.cpp

@@ -149,7 +149,7 @@ namespace Framework::GUI {
             return;
         }
 
-        std::lock_guard lock(_renderMutex);
+        std::scoped_lock lock(_renderMutex);
 
         // Update the view content
         View::Update();
@@ -160,7 +160,7 @@ namespace Framework::GUI {
             return;
         }
 
-        std::lock_guard lock(_renderMutex);
+        std::scoped_lock lock(_renderMutex);
 
         // Update D3D11 internal resources
         UpdateGeometry();

code/framework/src/gui/manager.cpp

@@ -70,7 +70,7 @@ namespace Framework::GUI {
         }
 
         // Update the renderer
-        std::lock_guard lock(_renderMutex);
+        std::scoped_lock lock(_renderMutex);
         _ultralightRenderer->Update();
         _ultralightRenderer->RefreshDisplay(0);
         _ultralightRenderer->Render();
@@ -95,7 +95,7 @@ namespace Framework::GUI {
             return a->GetZIndex() < b->GetZIndex();
         });
 
-        std::lock_guard lock(_renderMutex);
+        std::scoped_lock lock(_renderMutex);
 
         // Render the views
         for (auto &view : views) {

code/framework/src/gui/sdk.h

@@ -45,7 +45,7 @@ namespace Framework::GUI {
 
         inline void RemoveEventListener(std::string eventName) {
             // Make sure the event exist
-            if (_eventListeners.find(eventName) == _eventListeners.end()) {
+            if (!_eventListeners.contains(eventName)) {
                 return;
             }
 
@@ -55,7 +55,7 @@ namespace Framework::GUI {
 
         inline void BroadcastEvent(std::string eventName, std::string eventPayload) {
             // Make sure the event exist
-            if (_eventListeners.find(eventName) == _eventListeners.end()) {
+            if (!_eventListeners.contains(eventName)) {
                 return;
             }
 

code/framework/src/gui/view.cpp

@@ -59,7 +59,7 @@ namespace Framework::GUI {
             return;
         }
 
-        std::lock_guard lock(_renderMutex);
+        std::scoped_lock lock(_renderMutex);
 
         // Update the view content (CPU renderer)
         if (!_gpuAccelerated) {

code/framework/src/jobs/io_tasks.cpp

@@ -142,7 +142,7 @@ namespace Framework::Jobs::IO {
 
                     bool allDone = false;
                     {
-                        std::lock_guard<std::mutex> lock(state->mutex);
+                        std::scoped_lock lock(state->mutex);
                         state->results[i] = std::move(result);
                         state->completed++;
                         allDone = (state->completed == state->total);
@@ -194,7 +194,7 @@ namespace Framework::Jobs::IO {
                         result.success = false;
                     }
 
-                    std::lock_guard<std::mutex> lock(resultsMutex);
+                    std::scoped_lock lock(resultsMutex);
                     results[i] = std::move(result);
                 });
         }