songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up; eliminate warnings

This commit is contained in:
Efi Fogel 2025-09-16 14:41:21 +03:00
parent 2e087bc108
commit 05dd65609d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h
View File

@ -530,7 +530,7 @@ public:
this->m_arr = arr_vec[0].first; this->m_arr = arr_vec[0].first;
delete arr_vec[0].second; delete arr_vec[0].second;
if (res) { if (res) {
for (auto i = 1; i < arr_vec.size(); ++i) { for (std::size_t i = 1; i < arr_vec.size(); ++i) {
if (arr_vec[i].first) delete arr_vec[i].first; if (arr_vec[i].first) delete arr_vec[i].first;
if (arr_vec[i].second) delete arr_vec[i].second; if (arr_vec[i].second) delete arr_vec[i].second;
} }
@ -579,7 +579,7 @@ public:
this->m_arr = arr_vec[0].first; this->m_arr = arr_vec[0].first;
delete arr_vec[0].second; delete arr_vec[0].second;
if (res) { if (res) {
for (auto i = 1; i < arr_vec.size(); ++i) { for (std::size_t i = 1; i < arr_vec.size(); ++i) {
if (arr_vec[i].first) delete arr_vec[i].first; if (arr_vec[i].first) delete arr_vec[i].first;
if (arr_vec[i].second) delete arr_vec[i].second; if (arr_vec[i].second) delete arr_vec[i].second;
} }
@ -1336,7 +1336,7 @@ protected:
std::size_t size = std::distance(begin, end); std::size_t size = std::distance(begin, end);
auto it = begin; auto it = begin;
while (it != end) { while (it != end) {
std::size_t num = (std::min)(size+1, k); std::size_t num = std::min(size+1, k);
arr_entries.resize(num); arr_entries.resize(num);
for (std::size_t i = 1; i < num; ++i) { for (std::size_t i = 1; i < num; ++i) {
// process pgn // process pgn
@ -1353,12 +1353,17 @@ protected:
delete arr_entries[i].first; delete arr_entries[i].first;
delete arr_entries[i].second; delete arr_entries[i].second;
} }
if (res) {
arr_entries.clear();
return res;
}
arr_entries.resize(1); arr_entries.resize(1);
size -= (num-1); size -= (num-1);
} }
m_arr = arr_entries[0].first; m_arr = arr_entries[0].first;
m_vertices = arr_entries[0].second; m_vertices = arr_entries[0].second;
arr_entries.clear(); arr_entries.clear();
return false;
} }
// marks all faces as non-visited // marks all faces as non-visited