Skip to content
Snippets Groups Projects
Commit 9e97f69b authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[GL] mergePoints never returns anything but 'true'

Removing the return value.
parent 56832d02
No related branches found
No related tags found
No related merge requests found
...@@ -385,10 +385,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names, ...@@ -385,10 +385,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names,
std::vector<std::size_t> pnt_offsets(n_geo_names, 0); std::vector<std::size_t> pnt_offsets(n_geo_names, 0);
if (!mergePoints(geo_names, merged_geo_name, pnt_offsets)) mergePoints(geo_names, merged_geo_name, pnt_offsets);
{
return 1;
}
mergePolylines(geo_names, merged_geo_name, pnt_offsets); mergePolylines(geo_names, merged_geo_name, pnt_offsets);
...@@ -397,7 +394,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names, ...@@ -397,7 +394,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names,
return 0; return 0;
} }
bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names, void GEOObjects::mergePoints(std::vector<std::string> const& geo_names,
std::string& merged_geo_name, std::string& merged_geo_name,
std::vector<std::size_t>& pnt_offsets) std::vector<std::size_t>& pnt_offsets)
{ {
...@@ -442,7 +439,6 @@ bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names, ...@@ -442,7 +439,6 @@ bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names,
addPointVec(std::move(merged_points), merged_geo_name, addPointVec(std::move(merged_points), merged_geo_name,
std::move(merged_pnt_names), 1e-6); std::move(merged_pnt_names), 1e-6);
return true;
} }
void GEOObjects::mergePolylines(std::vector<std::string> const& geo_names, void GEOObjects::mergePolylines(std::vector<std::string> const& geo_names,
......
...@@ -323,9 +323,8 @@ private: ...@@ -323,9 +323,8 @@ private:
* @param merged_geo_name The (new) name of the geometry resulting from * @param merged_geo_name The (new) name of the geometry resulting from
* merging. * merging.
* @param pnt_offsets offsets in the merged vector storing the points * @param pnt_offsets offsets in the merged vector storing the points
* @return true, if merging the points succeeded, else false
*/ */
bool mergePoints(std::vector<std::string> const& geo_names, void mergePoints(std::vector<std::string> const& geo_names,
std::string& merged_geo_name, std::string& merged_geo_name,
std::vector<std::size_t>& pnt_offsets); std::vector<std::size_t>& pnt_offsets);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment