From eb84ffe5a6eb4a79b91e58c263bf222496ad5afb Mon Sep 17 00:00:00 2001 From: Woazboat Date: Wed, 6 May 2015 01:53:28 +0200 Subject: Added float comparison warning overrides to Vector3::hasNonZeroLength --- src/Vector3.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Vector3.h b/src/Vector3.h index d454fda06..f116c07f6 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -80,7 +80,16 @@ public: inline bool HasNonZeroLength(void) const { + #ifndef __GNUC__ + #pragma clang diagnostics push + #pragma clang diagnostics ignored "-Wfloat-equal" + #endif + return ((x != 0) || (y != 0) || (z != 0)); + + #ifndef __GNUC__ + #pragma clang diagnostics pop + #endif } inline double Length(void) const @@ -127,16 +136,16 @@ public: // Perform a strict comparison of the contents - we want to know whether this object is exactly equal // To perform EPS-based comparison, use the EqualsEps() function -#ifndef __GNUC__ -#pragma clang diagnostics push -#pragma clang diagnostics ignored "-Wfloat-equal" -#endif + #ifndef __GNUC__ + #pragma clang diagnostics push + #pragma clang diagnostics ignored "-Wfloat-equal" + #endif return !((x != a_Rhs.x) || (y != a_Rhs.y) || (z != a_Rhs.z)); -#ifndef __GNUC__ -#pragma clang diagnostics pop -#endif + #ifndef __GNUC__ + #pragma clang diagnostics pop + #endif } inline bool EqualsEps(const Vector3 & a_Rhs, T a_Eps) const -- cgit v1.2.3