Skip to content

Commit 23eeed1

Browse files
committed
Merge pull request #8547 from sloriot/SMS-minor_macro
Avoid collision with minor macro
2 parents 12fe9a1 + 8c18ff3 commit 23eeed1

File tree

1 file changed

+4
-4
lines changed
  • Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal

1 file changed

+4
-4
lines changed

Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/Lindstrom_Turk_core.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private :
190190
const FT ax=a.x(), ay=a.y(), az=a.z();
191191
const FT bx=b.x(), by=b.y(), bz=b.z();
192192

193-
auto minor = [](double ai, double bi, double aj, double bj)
193+
auto compute_minor = [](double ai, double bi, double aj, double bj)
194194
{
195195
// The main idea is that we expect ai and bi (and aj and bj) to have roughly the same magnitude
196196
// since this function is used to compute the cross product of two vectors that are defined
@@ -201,9 +201,9 @@ private :
201201
};
202202

203203
// ay*
204-
FT x = minor(ay, by, az, bz);
205-
FT y = minor(az, bz, ax, bx);
206-
FT z = minor(ax, bx, ay, by);
204+
FT x = compute_minor(ay, by, az, bz);
205+
FT y = compute_minor(az, bz, ax, bx);
206+
FT z = compute_minor(ax, bx, ay, by);
207207

208208
return Vector(x, y, z);
209209
}

0 commit comments

Comments
 (0)