From eaba777a0e268cb883cabb3259989a1d2d9911f0 Mon Sep 17 00:00:00 2001 From: Woazboat Date: Sat, 9 May 2015 01:15:45 +0200 Subject: Fixed compiler warning overrides in Vector3.h --- src/Vector3.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Vector3.h') diff --git a/src/Vector3.h b/src/Vector3.h index f116c07f6..355ba6a52 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -80,14 +80,14 @@ public: inline bool HasNonZeroLength(void) const { - #ifndef __GNUC__ + #ifdef __clang__ #pragma clang diagnostics push #pragma clang diagnostics ignored "-Wfloat-equal" #endif return ((x != 0) || (y != 0) || (z != 0)); - #ifndef __GNUC__ + #ifdef __clang__ #pragma clang diagnostics pop #endif } @@ -136,14 +136,14 @@ 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__ + #ifdef __clang__ #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__ + #ifdef __clang__ #pragma clang diagnostics pop #endif } -- cgit v1.2.3 From 4dcd9a99245e6059d3f16723d1353efaa495ca08 Mon Sep 17 00:00:00 2001 From: worktycho Date: Sat, 9 May 2015 10:55:40 +0100 Subject: clang diagnostic not diagnostics fixed clang pragmas --- src/Vector3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Vector3.h') diff --git a/src/Vector3.h b/src/Vector3.h index ed3f296a6..84e9183be 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -81,14 +81,14 @@ public: inline bool HasNonZeroLength(void) const { #ifdef __clang__ - #pragma clang diagnostics push - #pragma clang diagnostics ignored "-Wfloat-equal" + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wfloat-equal" #endif return ((x != 0) || (y != 0) || (z != 0)); #ifdef __clang__ - #pragma clang diagnostics pop + #pragma clang diagnostic pop #endif } -- cgit v1.2.3 From e2e206d81bad6c8624fb81ef46a6c81a69792f15 Mon Sep 17 00:00:00 2001 From: worktycho Date: Sat, 9 May 2015 10:59:08 +0100 Subject: Fixed remaing pragmas --- src/Vector3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Vector3.h') diff --git a/src/Vector3.h b/src/Vector3.h index 84e9183be..f051ce2d2 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -137,14 +137,14 @@ public: // To perform EPS-based comparison, use the EqualsEps() function #ifdef __clang__ - #pragma clang diagnostics push - #pragma clang diagnostics ignored "-Wfloat-equal" + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wfloat-equal" #endif return !((x != a_Rhs.x) || (y != a_Rhs.y) || (z != a_Rhs.z)); #ifdef __clang__ - #pragma clang diagnostics pop + #pragma clang diagnostic pop #endif } -- cgit v1.2.3