Experimental: C++17 build

google · Aug 21, 2023 · 181d34d · 181d34d
1 parent 4bdd70e
commit 181d34d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,10 +110,10 @@ if(MSVC)
     # 26812: unscoped enums are widely used by the project and dependencies.
     set(MSVC_DISABLED_WARNINGS "/wd26812")
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${MSVC_DISABLED_WARNINGS} /MP")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MSVC_DISABLED_WARNINGS} /MP /Zc:__cplusplus /std:c++20")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MSVC_DISABLED_WARNINGS} /MP /Zc:__cplusplus /std:c++17")
 else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-        -std=c++20 \
+        -std=c++17 \
         -fdiagnostics-color=always \
         -Wno-nullability-completeness \
         -Wno-deprecated-anon-enum-enum-conversion \
@@ -133,7 +133,7 @@ else()
     endif ()
 endif()
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 
 # ------------------------------------------------------------------------------
 # Configure PPX directories.

diff --git a/build.gradle b/build.gradle
@@ -105,11 +105,11 @@ subprojects {
                                   '-DPPX_BUILD_TESTS=FALSE'
                     }
                     if (project.name.contains("_xr")) {
-                        cppFlags '-std=c++20',
+                        cppFlags '-std=c++17',
                                  '-DXR_USE_PLATFORM_ANDROID'
                     }
                     else {
-                        cppFlags '-std=c++20'
+                        cppFlags '-std=c++17'
                     }
 
                     if (project.hasProperty('DXC_PATH')) {

diff --git a/include/ppx/command_line_parser.h b/include/ppx/command_line_parser.h
@@ -46,7 +46,7 @@ class CliOptions
 public:
     CliOptions() = default;
 
-    bool HasExtraOption(const std::string& option) const { return mAllOptions.contains(option); }
+    bool HasExtraOption(const std::string& option) const { return mAllOptions.find(option) == mAllOptions.end(); }
 
     // Returns the number of unique options and flags that were specified on the commandline,
     // not counting multiple appearances of the same flag such as: --assets-path a --assets-path b

diff --git a/include/ppx/window.h b/include/ppx/window.h
@@ -43,7 +43,7 @@ struct WindowSize
     WindowSize(uint32_t width_, uint32_t height_)
         : width(width_), height(height_) {}
 
-    bool operator==(const WindowSize&) const = default;
+    bool operator==(const WindowSize& other) const { return width == other.width && height == other.height; };
 };
 
 class Window

diff --git a/src/ppx/grfx/vk/vk_device.cpp b/src/ppx/grfx/vk/vk_device.cpp
@@ -72,27 +72,27 @@ Result Device::ConfigureQueueInfo(const grfx::DeviceCreateInfo* pCreateInfo, std
             createdQueues.insert(mGraphicsQueueFamilyIndex);
         }
         // Compute
-        if (mComputeQueueFamilyIndex != PPX_VALUE_IGNORED && !createdQueues.contains(mComputeQueueFamilyIndex)) {
+        if (mComputeQueueFamilyIndex != PPX_VALUE_IGNORED && createdQueues.find(mComputeQueueFamilyIndex) == createdQueues.end()) {
             VkDeviceQueueCreateInfo vkci = {VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO};
             vkci.queueFamilyIndex        = mComputeQueueFamilyIndex;
             vkci.queueCount              = pCreateInfo->pGpu->GetComputeQueueCount();
             vkci.pQueuePriorities        = DataPtr(queuePriorities);
             queueCreateInfos.push_back(vkci);
             createdQueues.insert(mComputeQueueFamilyIndex);
         }
-        else if (createdQueues.contains(mComputeQueueFamilyIndex)) {
+        else if (createdQueues.find(mComputeQueueFamilyIndex) != createdQueues.end()) {
             PPX_LOG_WARN("Graphics queue will be shared with compute queue.");
         }
         // Transfer
-        if (mTransferQueueFamilyIndex != PPX_VALUE_IGNORED && !createdQueues.contains(mTransferQueueFamilyIndex)) {
+        if (mTransferQueueFamilyIndex != PPX_VALUE_IGNORED && createdQueues.find(mTransferQueueFamilyIndex) == createdQueues.end()) {
             VkDeviceQueueCreateInfo vkci = {VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO};
             vkci.queueFamilyIndex        = mTransferQueueFamilyIndex;
             vkci.queueCount              = pCreateInfo->pGpu->GetTransferQueueCount();
             vkci.pQueuePriorities        = DataPtr(queuePriorities);
             queueCreateInfos.push_back(vkci);
             createdQueues.insert(mTransferQueueFamilyIndex);
         }
-        else if (createdQueues.contains(mTransferQueueFamilyIndex)) {
+        else if (createdQueues.find(mTransferQueueFamilyIndex) != createdQueues.end()) {
             PPX_LOG_WARN("Transfer queue will be shared with graphics or compute queue.");
         }
     }