Commit 152ca20b authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Fix compilation errors with clang

parent b946f0f4
Pipeline #180 failed with stage
...@@ -126,9 +126,9 @@ auto get_degs(size_t v, Vprop& vweight, Eprop& eweight, const simple_degs_t&, ...@@ -126,9 +126,9 @@ auto get_degs(size_t v, Vprop& vweight, Eprop& eweight, const simple_degs_t&,
Graph& g) Graph& g)
{ {
std::array<std::tuple<size_t, size_t, size_t>, 1> std::array<std::tuple<size_t, size_t, size_t>, 1>
degs {{make_tuple(in_degreeS()(v, g, eweight), degs {{make_tuple(size_t(in_degreeS()(v, g, eweight)),
out_degreeS()(v, g, eweight), size_t(out_degreeS()(v, g, eweight)),
vweight[v])}}; size_t(vweight[v]))}};
return degs; return degs;
} }
......
...@@ -49,7 +49,7 @@ auto merge_sweep(MergeState state, RNG& rng_) ...@@ -49,7 +49,7 @@ auto merge_sweep(MergeState state, RNG& rng_)
std::vector<merge_t> std::vector<merge_t>
best_merge(*std::max_element(state._available.begin(), best_merge(*std::max_element(state._available.begin(),
state._available.end()) + 1, state._available.end()) + 1,
make_tuple(0, 0, make_tuple(size_t(0), size_t(0),
numeric_limits<double>::max())); numeric_limits<double>::max()));
#pragma omp parallel firstprivate(state) if (state._parallel) #pragma omp parallel firstprivate(state) if (state._parallel)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment