fix initialization on Windows, i.e. cannot convert from bool to bool&

This commit is contained in:
Dennis Luxen 2014-07-15 15:37:30 +02:00
parent 695a2a2b6e
commit b47a3f15ce

View File

@ -176,16 +176,16 @@ class Contractor
1, 1,
diter->edge_id, diter->edge_id,
false, false,
static_cast<bool>(diter->forward), diter->forward ? true : false,
static_cast<bool>(diter->backward)); diter->backward ? true : false);
edges.emplace_back(diter->target, diter->source, edges.emplace_back(diter->target, diter->source,
static_cast<unsigned int>(std::max(diter->weight, 1)), static_cast<unsigned int>(std::max(diter->weight, 1)),
1, 1,
diter->edge_id, diter->edge_id,
false, false,
static_cast<bool>(diter->backward), diter->backward ? true : false,
static_cast<bool>(diter->forward)); diter->forward ? true : false);
} }
// clear input vector // clear input vector
input_edge_list.clear(); input_edge_list.clear();
@ -726,7 +726,7 @@ class Contractor
template <bool RUNSIMULATION> template <bool RUNSIMULATION>
inline bool inline bool
ContractNode(ContractorThreadData *data, NodeID node, ContractionStats *stats = nullptr) ContractNode(ContractorThreadData *data, const NodeID node, ContractionStats *stats = nullptr)
{ {
ContractorHeap &heap = data->heap; ContractorHeap &heap = data->heap;
int inserted_edges_size = data->inserted_edges.size(); int inserted_edges_size = data->inserted_edges.size();