From 3a7168eb553c9b5c7d127973c2686fc63aec65aa Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 8 May 2018 17:16:35 +0200 Subject: [PATCH] Tentative fix Clang build --- glm/gtx/easing.inl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/glm/gtx/easing.inl b/glm/gtx/easing.inl index d650eb23..1eb8c9dc 100644 --- a/glm/gtx/easing.inl +++ b/glm/gtx/easing.inl @@ -228,11 +228,11 @@ namespace glm{ if(a < static_cast(0.5)) { - return static_cast(0.5) * (one() - sqrt(one() - static_cast(4) * (a * a))); + return static_cast(0.5) * (one() - std::sqrt(one() - static_cast(4) * (a * a))); } else { - return static_cast(0.5) * (sqrt(-((static_cast(2) * a) - static_cast(3)) * ((static_cast(2) * a) - one())) + one()); + return static_cast(0.5) * (std::sqrt(-((static_cast(2) * a) - static_cast(3)) * ((static_cast(2) * a) - one())) + one()); } } @@ -246,7 +246,7 @@ namespace glm{ if(a <= zero()) return a; else - return pow(static_cast(2), static_cast(10) * (a - one())); + return std::pow(static_cast(2), static_cast(10) * (a - one())); } template @@ -259,7 +259,7 @@ namespace glm{ if(a >= one()) return a; else - return one() - pow(static_cast(2), -static_cast(10) * a); + return one() - std::pow(static_cast(2), -static_cast(10) * a); } template @@ -270,9 +270,9 @@ namespace glm{ assert(a <= one()); if(a < static_cast(0.5)) - return static_cast(0.5) * pow(static_cast(2), (static_cast(20) * a) - static_cast(10)); + return static_cast(0.5) * std::pow(static_cast(2), (static_cast(20) * a) - static_cast(10)); else - return -static_cast(0.5) * pow(static_cast(2), (-static_cast(20) * a) + static_cast(10)) + one(); + return -static_cast(0.5) * std::pow(static_cast(2), (-static_cast(20) * a) + static_cast(10)) + one(); } template @@ -282,7 +282,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return sin(static_cast(13) * half_pi() * a) * pow(static_cast(2), static_cast(10) * (a - one())); + return std::sin(static_cast(13) * half_pi() * a) * std::pow(static_cast(2), static_cast(10) * (a - one())); } template @@ -292,7 +292,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return sin(-static_cast(13) * half_pi() * (a + one())) * pow(static_cast(2), -static_cast(10) * a) + one(); + return std::sin(-static_cast(13) * half_pi() * (a + one())) * std::pow(static_cast(2), -static_cast(10) * a) + one(); } template @@ -303,9 +303,9 @@ namespace glm{ assert(a <= one()); if(a < static_cast(0.5)) - return static_cast(0.5) * sin(static_cast(13) * half_pi() * (static_cast(2) * a)) * pow(static_cast(2), static_cast(10) * ((static_cast(2) * a) - one())); + return static_cast(0.5) * std::sin(static_cast(13) * half_pi() * (static_cast(2) * a)) * std::pow(static_cast(2), static_cast(10) * ((static_cast(2) * a) - one())); else - return static_cast(0.5) * (sin(-static_cast(13) * half_pi() * ((static_cast(2) * a - one()) + one())) * pow(static_cast(2), -static_cast(10) * (static_cast(2) * a - one())) + static_cast(2)); + return static_cast(0.5) * (std::sin(-static_cast(13) * half_pi() * ((static_cast(2) * a - one()) + one())) * std::pow(static_cast(2), -static_cast(10) * (static_cast(2) * a - one())) + static_cast(2)); } template