Skip to content

Commit 6a0db5e

Browse files
Upgrade mac CI to newer os version
macos-11 is no longer supported by github. This includes benign changes to make the mac compiler happy.
1 parent b03987c commit 6a0db5e

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/all_ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
matrix:
4545
compiler: [clang]
4646
build: [Release, Debug]
47-
os: ['macos-11']
47+
os: ['macos-latest']
4848
uses: ./.github/workflows/generic_ci.yml
4949
with:
5050
install-name: 'install_osx.sh'

include/fcl/math/geometry-inl.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ void eigen_old(const Matrix3<S>& m, Vector3<S>& dout, Matrix3<S>& vout)
480480
int n = 3;
481481
int j, iq, ip, i;
482482
S tresh, theta, tau, t, sm, s, h, g, c;
483-
int nrot;
483+
int nrot = 0;
484484
S b[3];
485485
S z[3];
486486
S v[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
@@ -492,8 +492,6 @@ void eigen_old(const Matrix3<S>& m, Vector3<S>& dout, Matrix3<S>& vout)
492492
z[ip] = 0;
493493
}
494494

495-
nrot = 0;
496-
497495
for(i = 0; i < 50; ++i)
498496
{
499497
sm = 0;

0 commit comments

Comments
 (0)