[SCM] openni/master: Fix gcc6 compability

[jspricke-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0229606a25631b013de80b04489c8d203c477e5d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jan 23 15:24:51 2016 +0100

    Fix gcc6 compability

diff --git a/debian/patches/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch b/debian/patches/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch
new file mode 100644
index 0000000..bdb71f9
--- /dev/null
+++ b/debian/patches/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch
@@ -0,0 +1,81 @@
+From: Jochen Sprickerhof <git at 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
diff --git a/debian/patches/series b/debian/patches/series
index 0cceed6..46f4aec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 0013-Add-ARM-support.patch
 0014-Add-arm64-support.patch
 0015-Add-mipsel-support.patch
+0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch

-- 
openni packaging