Skip to content

Commit 1786320

Browse files
Zegerieagleivg
authored andcommitted
xrAICore: Fix hash_fixed_vertex_manager::to_u32 in Linux
Hopefully this time it doesn't break Windows.
1 parent c93673c commit 1786320

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/xrAICore/Navigation/graph_engine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#include "xrAICore/Navigation/vertex_manager_fixed.h"
1414
#include "xrAICore/Navigation/vertex_allocator_fixed.h"
1515
#include "xrAICore/Navigation/data_storage_bucket_list.h"
16+
#include "xrAICore/Navigation/PathManagers/path_manager.h"
17+
#include "xrAICore/Navigation/graph_engine_space.h"
1618
#ifndef AI_COMPILER
1719
#include "xrAICore/Navigation/vertex_manager_hash_fixed.h"
1820
#include "xrAICore/Navigation/data_storage_binary_heap.h"
1921
#endif
20-
#include "xrAICore/Navigation/PathManagers/path_manager.h"
21-
#include "xrAICore/Navigation/graph_engine_space.h"
2222
#include "xrEngine/profiler.h"
2323
#include "xrAICore/Components/problem_solver.h"
2424
#include "xrAICore/Components/operator_condition.h"

src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
#pragma once
1010

11+
namespace hash_fixed_vertex_manager
12+
{
13+
extern u32 to_u32(const GraphEngineSpace::CWorldState& other);
14+
extern u32 to_u32(const shared_str& other);
15+
}
16+
1117
#define TEMPLATE_SPECIALIZATION \
1218
template <typename TPathId, typename TIndex, u32 HashSize, u32 FixSize> \
1319
template <typename TPathBuilder, typename TVertexAllocator, typename TCompoundVertex>
@@ -67,11 +73,7 @@ inline bool CHashFixedVertexManager::is_opened(const Vertex& vertex) const { ret
6773
TEMPLATE_SPECIALIZATION
6874
inline u32 CHashFixedVertexManager::hash_index(const Index& vertex_id) const
6975
{
70-
#ifdef LINUX // FIXME!!
71-
return 0;
72-
#else
7376
return hash_fixed_vertex_manager::to_u32(vertex_id) % HashSize;
74-
#endif
7577
}
7678

7779
TEMPLATE_SPECIALIZATION

0 commit comments

Comments
 (0)