From 963ed37fd615454784c46be0a80ae6e03fcc0285 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Sun, 12 Jun 2022 16:00:52 -0400 Subject: structured_control_flow: Remove constexpr Flow::Block This seems to be unsupported in newer libstdc++ versions due to Flow::Block's base class being a non-literal type. It's not clear to me why this was permitted in earlier versions. --- src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp index 3dc7c9a11..578bc8c1b 100644 --- a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp @@ -975,13 +975,7 @@ private: Environment& env; IR::AbstractSyntaxList& syntax_list; bool uses_demote_to_helper{}; - -// TODO: C++20 Remove this when all compilers support constexpr std::vector -#if __cpp_lib_constexpr_vector >= 201907 - static constexpr Flow::Block dummy_flow_block; -#else const Flow::Block dummy_flow_block; -#endif }; } // Anonymous namespace -- cgit v1.2.3