diff --git a/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp b/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp index 97059d06..7937a2a7 100755 --- a/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp +++ b/engine/shared/library/sharedFoundation/src/linux/PlatformGlue.cpp @@ -3,11 +3,6 @@ #include -//real abs(real x) -//{ -// return fabs(x); -//} - int _stricmp(const char* string1, const char* string2) { int first, second; diff --git a/engine/shared/library/sharedMath/src/shared/Transform.h b/engine/shared/library/sharedMath/src/shared/Transform.h index f3e7d78a..82f27986 100755 --- a/engine/shared/library/sharedMath/src/shared/Transform.h +++ b/engine/shared/library/sharedMath/src/shared/Transform.h @@ -540,7 +540,7 @@ inline void Transform::move_l(const Vector &vec) inline bool Transform::isYawOnly(void) const { - return abs(matrix[1][1] - 1.0f) < 0.00001f; + return std::abs(matrix[1][1] - 1.0f) < 0.00001f; } // ---------------------------------------------------------------------- @@ -550,9 +550,9 @@ inline bool Transform::isYawOnly(void) const inline bool Transform::isTranslateOnly(void) const { - if(abs(matrix[0][0] - 1.0f) > 0.00001f) return false; - if(abs(matrix[1][1] - 1.0f) > 0.00001f) return false; - if(abs(matrix[2][2] - 1.0f) > 0.00001f) return false; + if(std::abs(matrix[0][0] - 1.0f) > 0.00001f) return false; + if(std::abs(matrix[1][1] - 1.0f) > 0.00001f) return false; + if(std::abs(matrix[2][2] - 1.0f) > 0.00001f) return false; return true; } diff --git a/engine/shared/library/sharedMath/src/shared/VectorArgb.h b/engine/shared/library/sharedMath/src/shared/VectorArgb.h index 6afbc2b0..ede68cef 100755 --- a/engine/shared/library/sharedMath/src/shared/VectorArgb.h +++ b/engine/shared/library/sharedMath/src/shared/VectorArgb.h @@ -100,7 +100,7 @@ inline bool VectorArgb::operator !=(const VectorArgb &rhs) const inline float VectorArgb::rgbIntensity() const { - return abs(r) * 0.30f + abs(g) * 0.59f + abs(b) * 0.11f; + return std::abs(r) * 0.30f + std::abs(g) * 0.59f + std::abs(b) * 0.11f; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedMath/src/shared/VectorRgba.h b/engine/shared/library/sharedMath/src/shared/VectorRgba.h index 6e522e24..a6a84f70 100755 --- a/engine/shared/library/sharedMath/src/shared/VectorRgba.h +++ b/engine/shared/library/sharedMath/src/shared/VectorRgba.h @@ -104,7 +104,7 @@ inline bool VectorRgba::operator !=(VectorRgba const & rhs) const inline float VectorRgba::rgbIntensity() const { - return abs(r) * 0.30f + abs(g) * 0.59f + abs(b) * 0.11f; + return std::abs(r) * 0.30f + std::abs(g) * 0.59f + std::abs(b) * 0.11f; } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedMath/src/shared/core/Torus.h b/engine/shared/library/sharedMath/src/shared/core/Torus.h index b00eba55..9801f460 100755 --- a/engine/shared/library/sharedMath/src/shared/core/Torus.h +++ b/engine/shared/library/sharedMath/src/shared/core/Torus.h @@ -94,7 +94,7 @@ inline float Torus::getMinorRadius ( void ) const inline bool Torus::isOriented ( void ) const { - return fabs(m_axis.y - 1.0f) > 0.00001f; + return std::abs(m_axis.y - 1.0f) > 0.00001f; } // ----------------------------------------------------------------------