From 8252a31e82b7416946b2509ed86ec0fff598922d Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Thu, 2 Feb 2012 02:19:11 +0000 Subject: [PATCH] # fix gcc compile errors git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1134 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/IFCCurve.cpp | 4 ++-- code/IRRLoader.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/IFCCurve.cpp b/code/IFCCurve.cpp index c7a90aab7..74927b29d 100644 --- a/code/IFCCurve.cpp +++ b/code/IFCCurve.cpp @@ -120,7 +120,7 @@ public: // -------------------------------------------------- IfcVector3 Eval(IfcFloat u) const { u = -conv.angle_scale * u; - return location + entity.Radius*(::cos(u)*p[0] + ::sin(u)*p[1]); + return location + entity.Radius*(static_cast(::cos(u))*p[0] + static_cast(::sin(u))*p[1]); } private: @@ -148,7 +148,7 @@ public: // -------------------------------------------------- IfcVector3 Eval(IfcFloat u) const { u = -conv.angle_scale * u; - return location + entity.SemiAxis1*::cos(u)*p[0] + entity.SemiAxis2*::sin(u)*p[1]; + return location + entity.SemiAxis1*static_cast(::cos(u))*p[0] + entity.SemiAxis2*static_cast(::sin(u))*p[1]; } private: diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp index 200fd70da..9cbe28880 100644 --- a/code/IRRLoader.cpp +++ b/code/IRRLoader.cpp @@ -457,7 +457,7 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector