Skip to content

Commit

Permalink
Merge pull request #8547 from sloriot/SMS-minor_macro
Browse files Browse the repository at this point in the history
Avoid collision with minor macro
  • Loading branch information
sloriot committed Oct 18, 2024
2 parents 12fe9a1 + 8c18ff3 commit 23eeed1
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ private :
const FT ax=a.x(), ay=a.y(), az=a.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
// since this function is used to compute the cross product of two vectors that are defined
Expand All @@ -201,9 +201,9 @@ private :
};

// ay*
FT x = minor(ay, by, az, bz);
FT y = minor(az, bz, ax, bx);
FT z = minor(ax, bx, ay, by);
FT x = compute_minor(ay, by, az, bz);
FT y = compute_minor(az, bz, ax, bx);
FT z = compute_minor(ax, bx, ay, by);

return Vector(x, y, z);
}
Expand Down

0 comments on commit 23eeed1

Please sign in to comment.