Skip to content

Commit 1a05967

Browse files
committed
avoid the identifier minor (problems under clang)
1 parent 5c13116 commit 1a05967

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

libsrc/mwprocs.cc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,23 @@ bigfloat det(const vector<vector<bigfloat>>& m, long m_size);
9494

9595
vector<vector<bigfloat>> get_minor(const vector<vector<bigfloat>>& m, long m_size, long i0, long j0)
9696
{
97-
vector<vector<bigfloat>> minor(MAXRANK, vector<bigfloat>(MAXRANK));
97+
vector<vector<bigfloat>> the_minor(MAXRANK, vector<bigfloat>(MAXRANK));
9898
for (long i=0; i<m_size-1; i++)
9999
{
100-
long ii=i;
101-
if(i>=i0) ii++;
100+
long ii = (i>=i0? i+1 : i);
102101
for (long j=0; j<m_size-1; j++)
103102
{
104-
long jj=j;
103+
long jj = (j>=j0? j+1 : j);
105104
if(j>=j0) jj++;
106-
minor[i][j] = m[ii][jj];
105+
the_minor[i][j] = m[ii][jj];
107106
}
108107
}
109-
return minor;
108+
return the_minor;
110109
}
111110

112111
bigfloat det_minor(const vector<vector<bigfloat>>& m, long m_size, long i0, long j0)
113112
{
114-
const vector<vector<bigfloat>>& minor = get_minor(m,m_size,i0,j0);
115-
return det(minor, m_size-1);
113+
return det(get_minor(m,m_size,i0,j0), m_size-1);
116114
}
117115

118116
bigfloat det(const vector<vector<bigfloat>>& m, long m_size)

0 commit comments

Comments
 (0)