Skip to content

Fix/compilation gcc 14.2 #1

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.

Sign up for GitHub

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

Open
drlight-code wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix/compilation gcc 14.2 #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ef81fc
add missing <limits> include
drlight-code Oct 28, 2024
da4ef3d
use std namespace for isnan
drlight-code Oct 28, 2024
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: 6 additions & 5 deletions source/Triangulate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <numeric>
#include <algorithm>
#include <cassert>
#include <limits>

// To ensure the loop is a simple polygon for the triangulation,
// ensure q is strictly closer to this_center than any other center, and strictly inside box
Expand Down Expand Up @@ -732,7 +733,7 @@ int sharpest_empty_triangle(int k, const std::vector<int> &next_vertex,
const double obtuse_thresh = 1.9999;
const double almost_obtuse_thresh = 1.8;
bool failed = false;
while (!is_empty_triangle[j] || angle_measure[j]>=obtuse_thresh || isnan(angle_measure[j]))
while (!is_empty_triangle[j] || angle_measure[j]>=obtuse_thresh || std::isnan(angle_measure[j]))
{
j = next_vertex[j];
if (j==k) // failsafe
Expand All @@ -759,7 +760,7 @@ int sharpest_empty_triangle(int k, const std::vector<int> &next_vertex,
double best_angle_measure = angle_measure[j];
double best_circumradius = circumradius_measure[j];
int best_empty_circ = empty_circ[j];
bool best_is_bad = !best_empty_triangle || best_angle_measure>=obtuse_thresh || isnan(best_angle_measure);
bool best_is_bad = !best_empty_triangle || best_angle_measure>=obtuse_thresh || std::isnan(best_angle_measure);
j = next_vertex[j];
const double zero_angle_measure = 1.0e-10;
do
Expand All @@ -782,7 +783,7 @@ int sharpest_empty_triangle(int k, const std::vector<int> &next_vertex,
// 3b. small circumradius
bool use_j = false;
// 1.
const bool j_is_bad = !is_empty_triangle[j] || (angle_measure[j]>=obtuse_thresh) || isnan(angle_measure[j]);
const bool j_is_bad = !is_empty_triangle[j] || (angle_measure[j]>=obtuse_thresh) || std::isnan(angle_measure[j]);
if (j_is_bad && !best_is_bad)
{
// don't use j
Expand All @@ -804,7 +805,7 @@ int sharpest_empty_triangle(int k, const std::vector<int> &next_vertex,
use_j = true;
}
// 2. best is almost obtuse, and j has a smaller angle
else if ((isnan(best_angle_measure) && !isnan(angle_measure[j])) ||
else if ((std::isnan(best_angle_measure) && !std::isnan(angle_measure[j])) ||
(best_angle_measure>=almost_obtuse_thresh && angle_measure[j]<best_angle_measure ))
{
use_j = true;
Expand All @@ -813,7 +814,7 @@ int sharpest_empty_triangle(int k, const std::vector<int> &next_vertex,
else if ( empty_circ[j] > best_empty_circ ||
(empty_circ[j] == best_empty_circ &&
(circumradius_measure[j] < best_circumradius ||
(isnan(best_circumradius) &&!isnan(circumradius_measure[j])))))
(std::isnan(best_circumradius) &&!std::isnan(circumradius_measure[j])))))
{
use_j = true;
}
Expand Down