Merge pull request #1972 from Woazboat/CodeCleanup_refactored
Fixed compiler warning overrides in Vector3.h
This commit is contained in:
commit
523db778d9
@ -80,14 +80,14 @@ public:
|
|||||||
|
|
||||||
inline bool HasNonZeroLength(void) const
|
inline bool HasNonZeroLength(void) const
|
||||||
{
|
{
|
||||||
#ifndef __GNUC__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostics push
|
#pragma clang diagnostics push
|
||||||
#pragma clang diagnostics ignored "-Wfloat-equal"
|
#pragma clang diagnostics ignored "-Wfloat-equal"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return ((x != 0) || (y != 0) || (z != 0));
|
return ((x != 0) || (y != 0) || (z != 0));
|
||||||
|
|
||||||
#ifndef __GNUC__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostics pop
|
#pragma clang diagnostics pop
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -136,14 +136,14 @@ public:
|
|||||||
// Perform a strict comparison of the contents - we want to know whether this object is exactly equal
|
// 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
|
// To perform EPS-based comparison, use the EqualsEps() function
|
||||||
|
|
||||||
#ifndef __GNUC__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostics push
|
#pragma clang diagnostics push
|
||||||
#pragma clang diagnostics ignored "-Wfloat-equal"
|
#pragma clang diagnostics ignored "-Wfloat-equal"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return !((x != a_Rhs.x) || (y != a_Rhs.y) || (z != a_Rhs.z));
|
return !((x != a_Rhs.x) || (y != a_Rhs.y) || (z != a_Rhs.z));
|
||||||
|
|
||||||
#ifndef __GNUC__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostics pop
|
#pragma clang diagnostics pop
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user