Skip to content

Commit b8163b6

Browse files
martin-frbgmartin-frbg
committed
Fix compilation error caused by inadvertent shadowing of variables in the MSVC c/z_div macros
1 parent 6bc4276 commit b8163b6

998 files changed

Lines changed: 1996 additions & 1996 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lapack-netlib/SRC/cbbcsd.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cbdsqr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbbrd.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbcon.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbequ.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbequb.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbrfs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbsv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbsvx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

‎lapack-netlib/SRC/cgbsvxx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ typedef struct Namelist Namelist;
190190
#define c_abs(z) (cabsf(Cf(z)))
191191
#define c_cos(R,Z) { pCf(R)=ccos(Cf(Z)); }
192192
#ifdef _MSC_VER
193-
#define c_div(c, a, b) {float n=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex z=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(z)/n,cimagf(z)/n);}
194-
#define z_div(c, a, b) {double n=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex z=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(z)/n,cimag(z)/n);}
193+
#define c_div(c, a, b) {float nenn=crealf(_FCmulcc(Cf(b),conjf(Cf(b)))); _Fcomplex zaehl=_FCmulcc(Cf(a),conjf(Cf(b))); pCf(c)=_FCbuild(crealf(zaehl)/nenn,cimagf(zaehl)/nenn);}
194+
#define z_div(c, a, b) {double nenn=creal(_Cmulcc(Cd(b),conj(Cd(b)))); _Dcomplex zaehl=_Cmulcc(Cd(a),conj(Cd(b))); pCd(c)=_Cbuild(creal(zaehl)/nenn,cimag(zaehl)/nenn);}
195195
#else
196196
#define c_div(c, a, b) {pCf(c) = Cf(a)/Cf(b);}
197197
#define z_div(c, a, b) {pCd(c) = Cd(a)/Cd(b);}

0 commit comments

Comments
 (0)