use constexpr if
This commit is contained in:
parent
aaf0c1ebb3
commit
cd2178905f
@ -47,8 +47,12 @@ template <> struct SearchEngineData<routing_algorithms::ch::Algorithm>
|
|||||||
util::UnorderedMapStorage<NodeID, int>>;
|
util::UnorderedMapStorage<NodeID, int>>;
|
||||||
|
|
||||||
using SearchEngineHeapPtr = boost::thread_specific_ptr<QueryHeap>;
|
using SearchEngineHeapPtr = boost::thread_specific_ptr<QueryHeap>;
|
||||||
|
|
||||||
using ManyToManyHeapPtr = boost::thread_specific_ptr<ManyToManyQueryHeap>;
|
using ManyToManyHeapPtr = boost::thread_specific_ptr<ManyToManyQueryHeap>;
|
||||||
|
|
||||||
|
using MapMatchingQueryHeap = QueryHeap;
|
||||||
|
using MapMatchingQueryHeapPtr = boost::thread_specific_ptr<QueryHeap>;
|
||||||
|
|
||||||
static SearchEngineHeapPtr forward_heap_1;
|
static SearchEngineHeapPtr forward_heap_1;
|
||||||
static SearchEngineHeapPtr reverse_heap_1;
|
static SearchEngineHeapPtr reverse_heap_1;
|
||||||
static SearchEngineHeapPtr forward_heap_2;
|
static SearchEngineHeapPtr forward_heap_2;
|
||||||
@ -56,8 +60,8 @@ template <> struct SearchEngineData<routing_algorithms::ch::Algorithm>
|
|||||||
static SearchEngineHeapPtr forward_heap_3;
|
static SearchEngineHeapPtr forward_heap_3;
|
||||||
static SearchEngineHeapPtr reverse_heap_3;
|
static SearchEngineHeapPtr reverse_heap_3;
|
||||||
static ManyToManyHeapPtr many_to_many_heap;
|
static ManyToManyHeapPtr many_to_many_heap;
|
||||||
static SearchEngineHeapPtr map_matching_forward_heap_1;
|
static MapMatchingQueryHeapPtr map_matching_forward_heap_1;
|
||||||
static SearchEngineHeapPtr map_matching_reverse_heap_1;
|
static MapMatchingQueryHeapPtr map_matching_reverse_heap_1;
|
||||||
|
|
||||||
void InitializeOrClearMapMatchingThreadLocalStorage(unsigned number_of_nodes);
|
void InitializeOrClearMapMatchingThreadLocalStorage(unsigned number_of_nodes);
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ void SearchEngineData<CH>::InitializeOrClearMapMatchingThreadLocalStorage(unsign
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
map_matching_forward_heap_1.reset(new QueryHeap(number_of_nodes));
|
map_matching_forward_heap_1.reset(new MapMatchingQueryHeap(number_of_nodes));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (map_matching_reverse_heap_1.get())
|
if (map_matching_reverse_heap_1.get())
|
||||||
@ -33,7 +33,7 @@ void SearchEngineData<CH>::InitializeOrClearMapMatchingThreadLocalStorage(unsign
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
map_matching_reverse_heap_1.reset(new QueryHeap(number_of_nodes));
|
map_matching_reverse_heap_1.reset(new MapMatchingQueryHeap(number_of_nodes));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user