From 36833c0c0fc1a841eaed63df6b7d34609307f2a5 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Mon, 27 Sep 2021 22:40:25 +0200
Subject: [PATCH] Rename minor to m to avoid conflicts with system macro
---
src/algebra/TinyMatrix.hpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/algebra/TinyMatrix.hpp b/src/algebra/TinyMatrix.hpp
index e347650b3..c4e98a149 100644
--- a/src/algebra/TinyMatrix.hpp
+++ b/src/algebra/TinyMatrix.hpp
@@ -427,24 +427,24 @@ getMinor(const TinyMatrix<M, N, T>& A, size_t I, size_t J)
{
static_assert(M >= 2 and N >= 2, "minor calculation requires at least 2x2 matrices");
Assert((I < M) and (J < N));
- TinyMatrix<M - 1, N - 1, T> minor;
+ TinyMatrix<M - 1, N - 1, T> m;
for (size_t i = 0; i < I; ++i) {
for (size_t j = 0; j < J; ++j) {
- minor(i, j) = A(i, j);
+ m(i, j) = A(i, j);
}
for (size_t j = J + 1; j < N; ++j) {
- minor(i, j - 1) = A(i, j);
+ m(i, j - 1) = A(i, j);
}
}
for (size_t i = I + 1; i < M; ++i) {
for (size_t j = 0; j < J; ++j) {
- minor(i - 1, j) = A(i, j);
+ m(i - 1, j) = A(i, j);
}
for (size_t j = J + 1; j < N; ++j) {
- minor(i - 1, j - 1) = A(i, j);
+ m(i - 1, j - 1) = A(i, j);
}
}
- return minor;
+ return m;
}
template <size_t N, typename T>
--
GitLab