From 143d7d391aa3ca38439b897b43c1f86eeb453be1 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 21 Nov 2020 20:21:26 +0100 Subject: [PATCH] Remove Value for size_t and correctly fix the problem --- include/Nazara/Shader/ShaderAstSerializer.hpp | 3 --- src/Nazara/Shader/ShaderAstSerializer.cpp | 12 +----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/include/Nazara/Shader/ShaderAstSerializer.hpp b/include/Nazara/Shader/ShaderAstSerializer.hpp index cfb30b058..ac03cc66d 100644 --- a/include/Nazara/Shader/ShaderAstSerializer.hpp +++ b/include/Nazara/Shader/ShaderAstSerializer.hpp @@ -68,7 +68,6 @@ namespace Nz virtual void Value(UInt16& val) = 0; virtual void Value(UInt32& val) = 0; virtual void Value(UInt64& val) = 0; - virtual void Value(std::size_t& val) = 0; inline void SizeT(std::size_t& val); virtual void Variable(ShaderNodes::VariablePtr& var) = 0; @@ -102,7 +101,6 @@ namespace Nz void Value(UInt16& val) override; void Value(UInt32& val) override; void Value(UInt64& val) override; - void Value(std::size_t& val) override; void Variable(ShaderNodes::VariablePtr& var) override; ByteStream& m_stream; @@ -134,7 +132,6 @@ namespace Nz void Value(UInt16& val) override; void Value(UInt32& val) override; void Value(UInt64& val) override; - void Value(std::size_t& val) override; void Variable(ShaderNodes::VariablePtr& var) override; ByteStream& m_stream; diff --git a/src/Nazara/Shader/ShaderAstSerializer.cpp b/src/Nazara/Shader/ShaderAstSerializer.cpp index 7d111c8a0..4e767540b 100644 --- a/src/Nazara/Shader/ShaderAstSerializer.cpp +++ b/src/Nazara/Shader/ShaderAstSerializer.cpp @@ -258,7 +258,7 @@ namespace Nz void ShaderAstSerializerBase::Serialize(ShaderNodes::SwizzleOp& node) { - Value(node.componentCount); + SizeT(node.componentCount); Node(node.expression); for (std::size_t i = 0; i < node.componentCount; ++i) @@ -465,11 +465,6 @@ namespace Nz { m_stream << val; } - - void ShaderAstSerializer::Value(std::size_t& val) - { - m_stream << val; - } void ShaderAstSerializer::Variable(ShaderNodes::VariablePtr& var) { @@ -737,11 +732,6 @@ namespace Nz m_stream >> val; } - void ShaderAstUnserializer::Value(std::size_t& val) - { - m_stream >> val; - } - void ShaderAstUnserializer::Variable(ShaderNodes::VariablePtr& var) { Int32 nodeTypeInt;