1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 23 Jan 2016 15:22:26 +0100
Subject: Rename equivalent to fix compilation on gcc6
Closes: #811848
---
Samples/NiViewer/glh/glh_linear.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/Samples/NiViewer/glh/glh_linear.h b/Samples/NiViewer/glh/glh_linear.h
index 422c05f..207adc5 100644
--- a/Samples/NiViewer/glh/glh_linear.h
+++ b/Samples/NiViewer/glh/glh_linear.h
@@ -77,7 +77,7 @@ glh_linear.h
#define GLH_EPSILON GLH_REAL(10e-6)
#define GLH_PI GLH_REAL(3.1415926535897932384626433832795)
-#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
+#define glh_equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
namespace glh
{
@@ -1093,7 +1093,7 @@ namespace glh
real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
- s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
+ s = (glh_equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
xs = q[0] * s;
ys = q[1] * s;
@@ -1194,7 +1194,7 @@ namespace glh
theta *= real(0.5);
real sin_theta = real(sin(theta));
- if (!equivalent(sqnorm,GLH_ONE))
+ if (!glh_equivalent(sqnorm,GLH_ONE))
sin_theta /= real(sqrt(sqnorm));
x = sin_theta * axis.v[0];
y = sin_theta * axis.v[1];
@@ -1216,14 +1216,14 @@ namespace glh
alpha = p1.dot(p2);
- if(equivalent(alpha,GLH_ONE))
+ if(glh_equivalent(alpha,GLH_ONE))
{
*this = identity();
return *this;
}
// ensures that the anti-parallel case leads to a positive dot
- if(equivalent(alpha,-GLH_ONE))
+ if(glh_equivalent(alpha,-GLH_ONE))
{
vec3 v;
@@ -1280,7 +1280,7 @@ namespace glh
void normalize()
{
real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
- if (equivalent(rnorm, GLH_ZERO))
+ if (glh_equivalent(rnorm, GLH_ZERO))
return;
x *= rnorm;
y *= rnorm;
@@ -1439,10 +1439,10 @@ namespace glh
inline
bool operator == ( const quaternion & q1, const quaternion & q2 )
{
- return (equivalent(q1.x, q2.x) &&
- equivalent(q1.y, q2.y) &&
- equivalent(q1.z, q2.z) &&
- equivalent(q1.w, q2.w) );
+ return (glh_equivalent(q1.x, q2.x) &&
+ glh_equivalent(q1.y, q2.y) &&
+ glh_equivalent(q1.z, q2.z) &&
+ glh_equivalent(q1.w, q2.w) );
}
inline
|