Commit d4d79c64 authored by Davis King's avatar Davis King

Renamed cdiv to cdiv_ to avoid conflicts with code that #defines cdiv

to some macro.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402864
parent 46e17915
...@@ -111,7 +111,7 @@ namespace dlib ...@@ -111,7 +111,7 @@ namespace dlib
// Complex scalar division. // Complex scalar division.
type cdivr, cdivi; type cdivr, cdivi;
void cdiv(type xr, type xi, type yr, type yi); void cdiv_(type xr, type xi, type yr, type yi);
// Nonsymmetric reduction from Hessenberg to real Schur form. // Nonsymmetric reduction from Hessenberg to real Schur form.
...@@ -704,7 +704,7 @@ namespace dlib ...@@ -704,7 +704,7 @@ namespace dlib
template <typename matrix_exp_type> template <typename matrix_exp_type>
void eigenvalue_decomposition<matrix_exp_type>:: void eigenvalue_decomposition<matrix_exp_type>::
cdiv(type xr, type xi, type yr, type yi) cdiv_(type xr, type xi, type yr, type yi)
{ {
using std::abs; using std::abs;
type r,d; type r,d;
...@@ -1159,7 +1159,7 @@ namespace dlib ...@@ -1159,7 +1159,7 @@ namespace dlib
} }
else else
{ {
cdiv(0.0,-H(n-1,n),H(n-1,n-1)-p,q); cdiv_(0.0,-H(n-1,n),H(n-1,n-1)-p,q);
H(n-1,n-1) = cdivr; H(n-1,n-1) = cdivr;
H(n-1,n) = cdivi; H(n-1,n) = cdivi;
} }
...@@ -1188,7 +1188,7 @@ namespace dlib ...@@ -1188,7 +1188,7 @@ namespace dlib
l = i; l = i;
if (e(i) == 0) if (e(i) == 0)
{ {
cdiv(-ra,-sa,w,q); cdiv_(-ra,-sa,w,q);
H(i,n-1) = cdivr; H(i,n-1) = cdivr;
H(i,n) = cdivi; H(i,n) = cdivi;
} }
...@@ -1206,7 +1206,7 @@ namespace dlib ...@@ -1206,7 +1206,7 @@ namespace dlib
vr = eps * norm * (abs(w) + abs(q) + vr = eps * norm * (abs(w) + abs(q) +
abs(x) + abs(y) + abs(z)); abs(x) + abs(y) + abs(z));
} }
cdiv(x*r-z*ra+q*sa,x*s-z*sa-q*ra,vr,vi); cdiv_(x*r-z*ra+q*sa,x*s-z*sa-q*ra,vr,vi);
H(i,n-1) = cdivr; H(i,n-1) = cdivr;
H(i,n) = cdivi; H(i,n) = cdivi;
if (abs(x) > (abs(z) + abs(q))) if (abs(x) > (abs(z) + abs(q)))
...@@ -1216,7 +1216,7 @@ namespace dlib ...@@ -1216,7 +1216,7 @@ namespace dlib
} }
else else
{ {
cdiv(-r-y*H(i,n-1),-s-y*H(i,n),z,q); cdiv_(-r-y*H(i,n-1),-s-y*H(i,n),z,q);
H(i+1,n-1) = cdivr; H(i+1,n-1) = cdivr;
H(i+1,n) = cdivi; H(i+1,n) = cdivi;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment