Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warning clang fix dev #2265

Merged
merged 2 commits into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ pgRouting 3.4.0 Release Notes
* ``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``


pgRouting 3.3.1 Release Notes
-------------------------------------------------------------------------------

To see all issues & pull requests closed by this release see the `Git closed
milestone for 3.3.1
<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.1%22>`_
on Github.

**Issue fixes**

* [#2216](https://github.com/pgRouting/pgrouting/issues/2216): Warnings when using clang

pgRouting 3.3.0 Release Notes
-------------------------------------------------------------------------------
Expand Down
12 changes: 11 additions & 1 deletion doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ To see the full list of changes check the list of `Git commits <https://github.c
:local:



pgRouting 3.4.0 Release Notes
-------------------------------------------------------------------------------

Expand Down Expand Up @@ -76,6 +75,17 @@ pgRouting 3.4.0 Release Notes
* ``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``


pgRouting 3.3.1 Release Notes
-------------------------------------------------------------------------------

To see all issues & pull requests closed by this release see the `Git closed
milestone for 3.3.1
<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.1%22>`_
on Github.

.. rubric:: Issue fixes

* `#2216 <https://github.com/pgRouting/pgrouting/issues/2216>`__: Warnings when using clang

pgRouting 3.3.0 Release Notes
-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/coloring/pgr_bipartite_driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class Pgr_Bipartite : public pgrouting::Pgr_messages {
int64_t vid = graph[*v].id;
boost::get(partition_map, *v) ==
boost::color_traits <boost::default_color_type>::white() ?
results.push_back({vid, 0}) :results.push_back({vid, 1});
results.push_back({{vid}, {0}}) :results.push_back({{vid}, {1}});
}
return results;
}
Expand Down
2 changes: 1 addition & 1 deletion include/coloring/pgr_sequentialVertexColoring.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class Pgr_sequentialVertexColoring {
for (boost::tie(v, vend) = vertices(graph.graph); v != vend; ++v) {
int64_t node = graph[*v].id;
auto color = colors[*v];
results.push_back({ node, static_cast<int64_t>(color + 1) });
results.push_back({{node}, {static_cast<int64_t>(color + 1)}});
}

// ordering the results in an increasing order of the node id
Expand Down
2 changes: 1 addition & 1 deletion include/components/pgr_makeConnected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Pgr_makeConnected : public pgrouting::Pgr_messages {
int64_t tgt = graph[graph.target(*ei)].id;
log<< "src:" << src<< "tgt:" << tgt <<"\n";
if (newEdge >= edgeCount) {
results[i] = {src, tgt};
results[i] = {{src}, {tgt}};
i++;
}
newEdge++;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Pgr_LTDTree : public pgrouting::Pgr_messages {
V_i v, vend;
for (boost::tie(v, vend) = vertices(graph.graph); v != vend; ++v) {
int64_t vid = graph[*v].id;
results.push_back({vid, (idoms[*v] != -1 ? (idoms[*v]+1) : 0) });
results.push_back({{vid}, {(idoms[*v] != -1 ? (idoms[*v]+1) : 0)}});
}

return results;
Expand Down
2 changes: 1 addition & 1 deletion src/bdAstar/bdAstar_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pgr_bdAstar(
return lhs.d1.source < rhs.d1.source;
});

II_t_rt previousCombination{0, 0};
II_t_rt previousCombination {{0}, {0}};

for (const II_t_rt &comb : combinations) {
fn_bdAstar.clear();
Expand Down
2 changes: 1 addition & 1 deletion src/bdDijkstra/bdDijkstra_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pgr_bdDijkstra(
return lhs.d1.source < rhs.d1.source;
});

II_t_rt previousCombination{0, 0};
II_t_rt previousCombination {{0}, {0}};

for (const II_t_rt &comb : combinations) {
fn_bdDijkstra.clear();
Expand Down
2 changes: 1 addition & 1 deletion src/coloring/pgr_edgeColoring.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Pgr_edgeColoring::edgeColoring() {
for (auto e_i : boost::make_iterator_range(boost::edges(graph))) {
auto edge = get_edge_id(e_i);
int64_t color = graph[e_i];
results.push_back({edge, (color + 1)});
results.push_back({{edge}, {(color + 1)}});
}
return results;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/componentsResult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ componentsResult(
for (const auto& component : components) {
auto component_id = component[0];
for (const auto edge_id : component) {
results.push_back({edge_id, component_id});
results.push_back({{edge_id}, {component_id}});
}
}
return results;
Expand Down
2 changes: 1 addition & 1 deletion src/trsp/pgr_trspHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ Pgr_trspHandler::process(
const std::map<int64_t, std::set<int64_t>> &combinations
) {
std::deque<Path> paths;
for (const auto c : combinations) {
for (const auto &c : combinations) {
for (const auto target : c.second) {
paths.push_back(process(c.first, target));
}
Expand Down