Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix assertions about hint size for windows

Browse Source
This commit is contained in:
Patrick Niklaus 2016-04-12 12:27:10 +02:00
parent 457ba9ac62
commit 621ed970da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/engine/hint.hpp
View File

@ -70,8 +70,8 @@ static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint),
"ENCODED_HINT_SIZE does not match size of Hint"); "ENCODED_HINT_SIZE does not match size of Hint");
#else #else
// PhantomNode is bigger under windows because MSVC does not support bit packing // PhantomNode is bigger under windows because MSVC does not support bit packing
static_assert(sizeof(Hint) == 64 + 4, "Hint is bigger than expected"); static_assert(sizeof(Hint) == 72 + 4, "Hint is bigger than expected");
constexpr std::size_t ENCODED_HINT_SIZE = 92; constexpr std::size_t ENCODED_HINT_SIZE = 96;
static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint), static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint),
"ENCODED_HINT_SIZE does not match size of Hint"); "ENCODED_HINT_SIZE does not match size of Hint");
#endif #endif

2
include/engine/phantom_node.hpp
View File

@ -168,7 +168,7 @@ struct PhantomNode
#ifndef _MSC_VER #ifndef _MSC_VER
static_assert(sizeof(PhantomNode) == 60, "PhantomNode has more padding then expected"); static_assert(sizeof(PhantomNode) == 60, "PhantomNode has more padding then expected");
#else #else
static_assert(sizeof(PhantomNode) == 64, "PhantomNode has more padding then expected"); static_assert(sizeof(PhantomNode) == 72, "PhantomNode has more padding then expected");
#endif #endif
using PhantomNodePair = std::pair<PhantomNode, PhantomNode>; using PhantomNodePair = std::pair<PhantomNode, PhantomNode>;