From c87affe276fbd1d2c4217a94f14696489512a6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Thu, 27 Aug 2020 20:12:54 +0200 Subject: [PATCH] Fix redefinition of type --- include/Nazara/Shader/GlslWriter.inl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Shader/GlslWriter.inl b/include/Nazara/Shader/GlslWriter.inl index 76972eec1..fd5cbe094 100644 --- a/include/Nazara/Shader/GlslWriter.inl +++ b/include/Nazara/Shader/GlslWriter.inl @@ -85,14 +85,14 @@ namespace Nz std::visit([&](auto&& arg) { - using T = std::decay_t; - if constexpr (std::is_same_v) + using U = std::decay_t; + if constexpr (std::is_same_v) { Append(arg); Append(" "); Append(var.name); } - else if constexpr (std::is_same_v) + else if constexpr (std::is_same_v) { const auto& structs = shader.GetStructs(); auto it = std::find_if(structs.begin(), structs.end(), [&](const auto& s) { return s.name == arg; }); @@ -115,7 +115,7 @@ namespace Nz Append(var.name); } else - static_assert(AlwaysFalse::value, "non-exhaustive visitor"); + static_assert(AlwaysFalse::value, "non-exhaustive visitor"); }, var.type);