From e0fa458f40af3b5aec087d28f54f9028c26a110e Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 10 Aug 2016 22:17:55 +0200 Subject: [PATCH] Fix compilation with GCC/Clang Thanks to @Gawaboumga Former-commit-id: b8cc59cab55fd7d3b286dda28e70ee0ddb753230 [formerly c734175c33bf84226eedb76953e773f5bb91f631] [formerly 01b6b7b89bffccf217e38ed8431e2b2921facc51 [formerly 03c3cd902be4a0a104db22a2831adeb675998929]] Former-commit-id: 89ce26d806f8b750854af1704aa6af899b7779b3 [formerly 782dbee06d75ba2f555632713b44f1c25666e3ab] Former-commit-id: 30ba1aff3bc8a8de9510fb6e4f417526fb31e125 --- SDK/include/NDK/Systems/ParticleSystem.hpp | 2 ++ build/scripts/tools/ndk_server.lua | 2 ++ include/Nazara/Core/Algorithm.inl | 2 +- include/Nazara/Graphics/MaterialPipeline.inl | 6 +++--- src/Nazara/Graphics/MaterialPipeline.cpp | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/SDK/include/NDK/Systems/ParticleSystem.hpp b/SDK/include/NDK/Systems/ParticleSystem.hpp index 3ae00a995..61149b206 100644 --- a/SDK/include/NDK/Systems/ParticleSystem.hpp +++ b/SDK/include/NDK/Systems/ParticleSystem.hpp @@ -4,6 +4,7 @@ #pragma once +#ifndef NDK_SERVER #ifndef NDK_SYSTEMS_PARTICLESYSTEM_HPP #define NDK_SYSTEMS_PARTICLESYSTEM_HPP @@ -27,3 +28,4 @@ namespace Ndk #include #endif // NDK_SYSTEMS_PARTICLESYSTEM_HPP +#endif // NDK_SERVER diff --git a/build/scripts/tools/ndk_server.lua b/build/scripts/tools/ndk_server.lua index e536f1036..aa8548b80 100644 --- a/build/scripts/tools/ndk_server.lua +++ b/build/scripts/tools/ndk_server.lua @@ -30,6 +30,8 @@ TOOL.FilesExcluded = { "../SDK/**/LightComponent.*", "../SDK/**/ListenerComponent.*", "../SDK/**/ListenerSystem.*", + "../SDK/**/Particle*Component.*", + "../SDK/**/ParticleSystem.*", "../SDK/**/RenderSystem.*", "../SDK/**/LuaBinding_Audio.*", "../SDK/**/LuaBinding_Graphics.*", diff --git a/include/Nazara/Core/Algorithm.inl b/include/Nazara/Core/Algorithm.inl index c77a5c3bb..0cadd1631 100644 --- a/include/Nazara/Core/Algorithm.inl +++ b/include/Nazara/Core/Algorithm.inl @@ -124,7 +124,7 @@ namespace Nz template constexpr std::size_t CountOf(T(&name)[N]) noexcept { - NazaraUnused(name); + // NazaraUnused(name); //< Because "body of function is not a return-statement" >.> return N; } diff --git a/include/Nazara/Graphics/MaterialPipeline.inl b/include/Nazara/Graphics/MaterialPipeline.inl index ebd94a9ee..ce937883d 100644 --- a/include/Nazara/Graphics/MaterialPipeline.inl +++ b/include/Nazara/Graphics/MaterialPipeline.inl @@ -61,7 +61,7 @@ namespace Nz if (!operator==(static_cast(lhs), static_cast(rhs))) return false; - #define NazaraPipelineMember(field) if (lhs.##field != rhs.##field) return false + #define NazaraPipelineMember(field) if (lhs.field != rhs.field) return false #define NazaraPipelineBoolMember NazaraPipelineMember NazaraPipelineBoolMember(alphaTest); @@ -115,8 +115,8 @@ namespace std Nz::UInt16 parameterHash = 0; Nz::UInt16 parameterIndex = 0; - #define NazaraPipelineMember(member) Nz::HashCombine(seed, pipelineInfo.##member) - #define NazaraPipelineBoolMember(member) parameterHash |= ((pipelineInfo.##member) ? 1U : 0U) << (parameterIndex++) + #define NazaraPipelineMember(member) Nz::HashCombine(seed, pipelineInfo.member) + #define NazaraPipelineBoolMember(member) parameterHash |= ((pipelineInfo.member) ? 1U : 0U) << (parameterIndex++) NazaraPipelineBoolMember(alphaTest); NazaraPipelineBoolMember(depthSorting); diff --git a/src/Nazara/Graphics/MaterialPipeline.cpp b/src/Nazara/Graphics/MaterialPipeline.cpp index 01e9ffe5d..4cbd56274 100644 --- a/src/Nazara/Graphics/MaterialPipeline.cpp +++ b/src/Nazara/Graphics/MaterialPipeline.cpp @@ -49,8 +49,8 @@ namespace Nz */ MaterialPipelineRef MaterialPipeline::GetPipeline(const MaterialPipelineInfo& pipelineInfo) { - auto it = s_pipelineCache.lower_bound(pipelineInfo); - if (it == s_pipelineCache.end() || it->first != pipelineInfo) + auto it = s_pipelineCache.find(pipelineInfo); + if (it == s_pipelineCache.end()) it = s_pipelineCache.insert(it, PipelineCache::value_type(pipelineInfo, New(pipelineInfo))); return it->second;