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

Merge pull request #8547 from sloriot/SMS-minor_macro 

Avoid collision with minor macro
This commit is contained in:
Sébastien Loriot 2024-10-18 18:03:25 +02:00
parent 12fe9a1b83 8c18ff3d0f
commit 23eeed10f3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/Lindstrom_Turk_core.h
View File

@ -190,7 +190,7 @@ private :
const FT ax=a.x(), ay=a.y(), az=a.z(); const FT ax=a.x(), ay=a.y(), az=a.z();
const FT bx=b.x(), by=b.y(), bz=b.z(); const FT bx=b.x(), by=b.y(), bz=b.z();
auto minor = [](double ai, double bi, double aj, double bj) auto compute_minor = [](double ai, double bi, double aj, double bj)
{ {
// The main idea is that we expect ai and bi (and aj and bj) to have roughly the same magnitude // The main idea is that we expect ai and bi (and aj and bj) to have roughly the same magnitude
// since this function is used to compute the cross product of two vectors that are defined // since this function is used to compute the cross product of two vectors that are defined
@ -201,9 +201,9 @@ private :
}; };
// ay* // ay*
FT x = minor(ay, by, az, bz); FT x = compute_minor(ay, by, az, bz);
FT y = minor(az, bz, ax, bx); FT y = compute_minor(az, bz, ax, bx);
FT z = minor(ax, bx, ay, by); FT z = compute_minor(ax, bx, ay, by);
return Vector(x, y, z); return Vector(x, y, z);
} }