From 3b3baa996b2485855534f08b68c52f3a40149598 Mon Sep 17 00:00:00 2001 From: ehofman Date: Sun, 7 Mar 2004 09:36:31 +0000 Subject: [PATCH] MSVC .NET 2003 fix --- simgear/environment/metar.cxx | 4 ++-- simgear/misc/zfstream.hxx | 2 +- simgear/scene/sky/clouds3d/SkyLight.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simgear/environment/metar.cxx b/simgear/environment/metar.cxx index b18f975b..124fa3f2 100644 --- a/simgear/environment/metar.cxx +++ b/simgear/environment/metar.cxx @@ -815,8 +815,8 @@ double SGMetar::getRelHumidity() const { if (_temp == NaN || _dewp == NaN) return NaN; - double dewp = pow(10, 7.5 * _dewp / (237.7 + _dewp)); - double temp = pow(10, 7.5 * _temp / (237.7 + _temp)); + double dewp = pow(10.0, 7.5 * _dewp / (237.7 + _dewp)); + double temp = pow(10.0, 7.5 * _temp / (237.7 + _temp)); return dewp * 100 / temp; } diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx index 153c357e..2b0f10c4 100644 --- a/simgear/misc/zfstream.hxx +++ b/simgear/misc/zfstream.hxx @@ -141,7 +141,7 @@ public: protected: virtual int_type underflow(); - virtual int_type overflow( int_type c = traits_type::eof() ); + virtual int_type overflow( int_type c = streambuf::traits_type::eof() ); private: diff --git a/simgear/scene/sky/clouds3d/SkyLight.cpp b/simgear/scene/sky/clouds3d/SkyLight.cpp index 4ae60569..59553cfb 100644 --- a/simgear/scene/sky/clouds3d/SkyLight.cpp +++ b/simgear/scene/sky/clouds3d/SkyLight.cpp @@ -167,7 +167,7 @@ void SkyLight::Display() const mat.invLookAt(vecPos + 50 * vecDir, vecPos + 51 * vecDir, vecUp); glMultMatrixf(mat); - float rAlpha= acos(pow(10, (-12 / _rSpotExponent))); + float rAlpha= acos(pow(10.0, (-12.0 / _rSpotExponent))); //glutWireCone(50 * tan(SKYDEGREESTORADS * rAlpha), 50, 16, 8); glutWireCone(50 * tan(SKYDEGREESTORADS * _rSpotCutoff), 50, 16, 8); } -- 2.39.5