From 80208b0dc59dc17db96c60d8782f33977994462a Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 17 Jun 2015 23:32:48 +0200 Subject: [PATCH] Core/OffsetOf: Remove constexpr (cannot be used because of reinterpret_cast) Former-commit-id: 78142eb9033a1969f20055b2cecf1bc78152e896 --- include/Nazara/Core/OffsetOf.hpp | 3 ++- src/Nazara/Graphics/DepthRenderTechnique.cpp | 2 -- src/Nazara/Graphics/ForwardRenderTechnique.cpp | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/Nazara/Core/OffsetOf.hpp b/include/Nazara/Core/OffsetOf.hpp index 4f13abacf..870481627 100644 --- a/include/Nazara/Core/OffsetOf.hpp +++ b/include/Nazara/Core/OffsetOf.hpp @@ -14,8 +14,9 @@ template T NzImplGetClassType(M T::*); template M NzImplGetMemberType(M T::*); template -constexpr std::size_t NzImplOffsetOf() +std::size_t NzImplOffsetOf() { + ///FIXME: reinterpret_cast is not allowed in constexpr functions return reinterpret_cast(&((static_cast(0))->*M)); } diff --git a/src/Nazara/Graphics/DepthRenderTechnique.cpp b/src/Nazara/Graphics/DepthRenderTechnique.cpp index c6da59276..9fe00be37 100644 --- a/src/Nazara/Graphics/DepthRenderTechnique.cpp +++ b/src/Nazara/Graphics/DepthRenderTechnique.cpp @@ -31,8 +31,6 @@ namespace NzVector2f uv; }; - static_assert(NzOffsetOf(BillboardPoint, sinCos) - NzOffsetOf(BillboardPoint, size) == sizeof(NzVector2f), "size and sinCos members should be packed"); - unsigned int s_maxQuads = std::numeric_limits::max()/6; unsigned int s_vertexBufferSize = 4*1024*1024; // 4 MiB } diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp index 37e9efdde..656f34d5d 100644 --- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp +++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp @@ -31,8 +31,6 @@ namespace NzVector2f uv; }; - static_assert(NzOffsetOf(BillboardPoint, sinCos) - NzOffsetOf(BillboardPoint, size) == sizeof(NzVector2f), "size and sinCos members should be packed"); - unsigned int s_maxQuads = std::numeric_limits::max()/6; unsigned int s_vertexBufferSize = 4*1024*1024; // 4 MiB }