From 2147b4db75e62c82a4d1212e9910655bc7a15635 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Wed, 7 Aug 2024 11:08:53 -0400 Subject: [PATCH] Fix build errors on GCC 14 Fix errors due to the new template-id-cdtor warning, e.g.: renderdoc/renderdoc/driver/vulkan/vk_serialise.cpp:201:58: error: template-id not allowed for constructor in C++20 [-Werror=template-id-cdtor] 201 | OptionalResources>(Serialiser &ser) | --- renderdoc/driver/vulkan/vk_serialise.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index 61ccb7919..2559a8c53 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -198,12 +198,9 @@ private: template <> struct OptionalResources> { - OptionalResources>(Serialiser &ser) - { - } - ~OptionalResources>() {} - OptionalResources>( - const OptionalResources> &) = default; + OptionalResources(Serialiser &ser) {} + ~OptionalResources() {} + OptionalResources(const OptionalResources> &) = default; OptionalResources> &operator=( const OptionalResources> &) = default; }; @@ -211,13 +208,9 @@ struct OptionalResources> template <> struct OptionalResources> { - OptionalResources>(Serialiser &ser) - { - Counter++; - } - ~OptionalResources>() { Counter--; } - OptionalResources>( - const OptionalResources> &) = default; + OptionalResources(Serialiser &ser) { Counter++; } + ~OptionalResources() { Counter--; } + OptionalResources(const OptionalResources> &) = default; OptionalResources> &operator=( const OptionalResources> &) = default; static int Counter;