From 621ed970da1483f874b969cc75df11c023848040 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 12 Apr 2016 12:27:10 +0200 Subject: [PATCH] Fix assertions about hint size for windows --- include/engine/hint.hpp | 4 ++-- include/engine/phantom_node.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/engine/hint.hpp b/include/engine/hint.hpp index 0ecaff6dd..7930a1373 100644 --- a/include/engine/hint.hpp +++ b/include/engine/hint.hpp @@ -70,8 +70,8 @@ static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint), "ENCODED_HINT_SIZE does not match size of Hint"); #else // PhantomNode is bigger under windows because MSVC does not support bit packing -static_assert(sizeof(Hint) == 64 + 4, "Hint is bigger than expected"); -constexpr std::size_t ENCODED_HINT_SIZE = 92; +static_assert(sizeof(Hint) == 72 + 4, "Hint is bigger than expected"); +constexpr std::size_t ENCODED_HINT_SIZE = 96; static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint), "ENCODED_HINT_SIZE does not match size of Hint"); #endif diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp index 244276cdf..88724b171 100644 --- a/include/engine/phantom_node.hpp +++ b/include/engine/phantom_node.hpp @@ -168,7 +168,7 @@ struct PhantomNode #ifndef _MSC_VER static_assert(sizeof(PhantomNode) == 60, "PhantomNode has more padding then expected"); #else -static_assert(sizeof(PhantomNode) == 64, "PhantomNode has more padding then expected"); +static_assert(sizeof(PhantomNode) == 72, "PhantomNode has more padding then expected"); #endif using PhantomNodePair = std::pair;