Commit a35440a9 authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Appease clang, and suppress some harmless warnings

parent 66f3d525
......@@ -376,7 +376,8 @@ struct move_sweep_dispatch
sampler_map_t sampler = any_cast<sampler_map_t>(asampler);
sampler_map_t cavity_sampler = any_cast<sampler_map_t>(acavity_sampler);
ConstantPropertyMap<std::array<int, 1>, typename graph_traits<Graph>::vertex_descriptor> cv({-1});
ConstantPropertyMap<std::array<int, 1>, typename graph_traits<Graph>::vertex_descriptor>
cv(std::array<int, 1>({{-1}}));
IdentityArrayPropertyMap<typename graph_traits<Graph>::vertex_descriptor> vmap;
boost::typed_identity_property_map<int> identity;
......
......@@ -54,7 +54,7 @@ public:
typedef Key key_type;
typedef boost::readable_property_map_tag category;
const value_type operator[](const key_type& c) const { return {c}; }
const value_type operator[](const key_type& c) const { return {{c}}; }
};
// ====================
......@@ -1216,7 +1216,7 @@ void move_vertex(size_t v, size_t nr, Eprop& mrs, Vprop& mrp, Vprop& mrm,
OStats& overlap_stats, PStats& partition_stats,
const NPolicy& npolicy = NPolicy())
{
std::array<size_t, 1> vs = {v};
std::array<size_t, 1> vs = {{v}};
move_vertex(vs, nr, mrs, mrp, mrm, wr, b, deg_corr, eweight, vweight, g, bg,
emat, overlap_stats, partition_stats, npolicy);
}
......@@ -1580,7 +1580,7 @@ double virtual_move_sparse(size_t v, size_t nr, Eprop& mrs, Vprop& mrp,
IL is_loop = IL())
{
std::array<size_t, 1> vs = {v};
std::array<size_t, 1> vs = {{v}};
return virtual_move_sparse(vs, nr, mrs, mrp, mrm, wr, b, deg_corr, eweight,
vweight, g, bg, emat, m_entries, overlap_stats,
parallel_edges, npolicy, is_loop);
......@@ -1768,7 +1768,7 @@ double virtual_move_dense(size_t v, size_t nr, Eprop& mrs, Vprop& mrp,
OStats& overlap_stats, bool multigraph,
const NPolicy& npolicy = NPolicy(), IL is_loop = IL())
{
std::array<size_t, 1> vs = {v};
std::array<size_t, 1> vs = {{v}};
return virtual_move_dense(vs, nr, mrs, mrp, mrm, wr, b, deg_corr, eweight,
vweight, g, bg, emat, m_entries, overlap_stats,
multigraph, npolicy, is_loop);
......
......@@ -190,7 +190,8 @@ struct move_sweep_overlap_dispatch
sampler_map_t cavity_sampler = any_cast<sampler_map_t>(acavity_sampler);
ConstantPropertyMap<int, typename graph_traits<Graph>::edge_descriptor> ce(0);
ConstantPropertyMap<std::array<int, 1>, typename graph_traits<Graph>::vertex_descriptor> cv({-1});
ConstantPropertyMap<std::array<int, 1>, typename graph_traits<Graph>::vertex_descriptor>
cv(std::array<int, 1>({{-1}}));
IdentityArrayPropertyMap<typename graph_traits<Graph>::vertex_descriptor> vmap;
boost::typed_identity_property_map<int> identity;
......
......@@ -655,7 +655,7 @@ struct overlap_partition_stats_t
if (!has_r || !has_nr)
{
is_same_bv = false;
std::array<size_t, 2> ss = {r, nr};
std::array<size_t, 2> ss = {{r, nr}};
for (auto s : ss)
{
auto& d_s = _deg_delta[s];
......
Markdown is supported
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