server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possible compile/link error with multiple BuildContext definitions

Browse Source 
There is a class and a struct called BuildContext in two different files,
one .h and one .cpp. Depending on how the user structures their program,
it's possible that this would cause a compile or link error, as seems to
have happened in #44. I've just renamed the struct to get around this.

Fixes #44
This commit is contained in:
Ben Hymers 2016-01-14 23:57:48 +00:00
parent 0143337a64
commit f117bf4a91
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DetourTileCache/Source/DetourTileCache.cpp
View File

@ -40,10 +40,10 @@ inline int computeTileHash(int x, int y, const int mask)
} }
struct BuildContext struct NavMeshTileBuildContext
{ {
inline BuildContext(struct dtTileCacheAlloc* a) : layer(0), lcset(0), lmesh(0), alloc(a) {} inline NavMeshTileBuildContext(struct dtTileCacheAlloc* a) : layer(0), lcset(0), lmesh(0), alloc(a) {}
inline ~BuildContext() { purge(); } inline ~NavMeshTileBuildContext() { purge(); }
void purge() void purge()
{ {
dtFreeTileCacheLayer(alloc, layer); dtFreeTileCacheLayer(alloc, layer);
@ -587,7 +587,7 @@ dtStatus dtTileCache::buildNavMeshTile(const dtCompressedTileRef ref, dtNavMesh*
m_talloc->reset(); m_talloc->reset();
BuildContext bc(m_talloc); NavMeshTileBuildContext bc(m_talloc);
const int walkableClimbVx = (int)(m_params.walkableClimb / m_params.ch); const int walkableClimbVx = (int)(m_params.walkableClimb / m_params.ch);
dtStatus status; dtStatus status;