From d4b2cede159943f59ba4e8a0a879fedfadf2fdd1 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 24 Aug 2023 17:58:49 +0200 Subject: [PATCH] Fix compilation of FFMpeg plugin/emscripten/ShaderNode --- plugins/FFmpeg/Plugin.cpp | 2 +- src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp | 2 +- src/Nazara/OpenGLRenderer/Wrapper/Web/WebLoader.cpp | 2 +- src/ShaderNode/Enums.hpp | 2 +- src/ShaderNode/Enums.inl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/FFmpeg/Plugin.cpp b/plugins/FFmpeg/Plugin.cpp index 914a524a6..7d1a7d415 100644 --- a/plugins/FFmpeg/Plugin.cpp +++ b/plugins/FFmpeg/Plugin.cpp @@ -393,7 +393,7 @@ namespace int m_videoStream; }; - bool CheckVideoExtension(const std::string_view& extension) + bool CheckVideoExtension(std::string_view extension) { const AVOutputFormat* format = av_guess_format(nullptr, extension.data(), nullptr); if (!format) diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp index 199002724..91602c5f4 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Web/WebContext.cpp @@ -140,7 +140,7 @@ namespace Nz::GL return true; } - bool WebContext::ImplementFallback(const std::string_view& function) + bool WebContext::ImplementFallback(std::string_view function) { if (Context::ImplementFallback(function)) return true; diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Web/WebLoader.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Web/WebLoader.cpp index cbddd4359..f893272bf 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Web/WebLoader.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Web/WebLoader.cpp @@ -113,7 +113,7 @@ namespace Nz::GL } } - bool WebLoader::ImplementFallback(const std::string_view& /*function*/) + bool WebLoader::ImplementFallback(std::string_view /*function*/) { return false; } diff --git a/src/ShaderNode/Enums.hpp b/src/ShaderNode/Enums.hpp index c57969fb2..052c080f0 100644 --- a/src/ShaderNode/Enums.hpp +++ b/src/ShaderNode/Enums.hpp @@ -64,7 +64,7 @@ enum class TextureType constexpr std::size_t TextureTypeCount = static_cast(TextureType::Max) + 1; -template std::optional DecodeEnum(const std::string_view& str); +template std::optional DecodeEnum(std::string_view str); const char* EnumToString(BufferType bufferType); const char* EnumToString(InputRole role); const char* EnumToString(PrimitiveType input); diff --git a/src/ShaderNode/Enums.inl b/src/ShaderNode/Enums.inl index f54d0801f..7bf76a662 100644 --- a/src/ShaderNode/Enums.inl +++ b/src/ShaderNode/Enums.inl @@ -1,7 +1,7 @@ #include template -std::optional DecodeEnum(const std::string_view& str) +std::optional DecodeEnum(std::string_view str) { constexpr std::size_t ValueCount = static_cast(T::Max) + 1; for (std::size_t i = 0; i < ValueCount; ++i)