From e4653be9a1db9b1c5167677bbb30993de3a92f87 Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 19 Oct 2000 22:27:27 +0000 Subject: [PATCH] MSVC++ fixes. --- simgear/metar/MetarStation.cpp | 2 +- simgear/sky/moon.cxx | 6 ++++-- simgear/xml/easyxml.cxx | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp index d7ead145..927106c0 100644 --- a/simgear/metar/MetarStation.cpp +++ b/simgear/metar/MetarStation.cpp @@ -86,7 +86,7 @@ CMetarStation::CMetarStation( double ualtitude = atoi( s ) * FEET_TO_METER; Point3D p( longitude, latitude, altitude+EQUATORIAL_RADIUS_M ); m_locationPolar = p; - m_locationCart = fgPolarToCart3d( p ); + m_locationCart = sgPolarToCart3d( p ); Point3D up( ulongitude, ulatitude, ualtitude+EQUATORIAL_RADIUS_M ); m_upperLocationPolar = up; m_upperLocationCart = fgPolarToCart3d( up ); diff --git a/simgear/sky/moon.cxx b/simgear/sky/moon.cxx index c5310fd4..dffbb523 100644 --- a/simgear/sky/moon.cxx +++ b/simgear/sky/moon.cxx @@ -29,6 +29,8 @@ # include #endif +#include + #include #include @@ -88,7 +90,7 @@ static int sgMoonHaloPreDraw( ssgEntity *e ) { if ( f -> hasState () ) f->getState()->apply() ; glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_FOG_BIT | GL_COLOR_BUFFER_BIT); - cout << "push error = " << glGetError() << endl; + // cout << "push error = " << glGetError() << endl; glDisable( GL_DEPTH_TEST ); glDisable( GL_FOG ); @@ -105,7 +107,7 @@ static int sgMoonHaloPostDraw( ssgEntity *e ) { // glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; glPopAttrib(); - cout << "pop error = " << glGetError() << endl; + // cout << "pop error = " << glGetError() << endl; return true; } diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx index 81038fec..979d0877 100644 --- a/simgear/xml/easyxml.cxx +++ b/simgear/xml/easyxml.cxx @@ -1,5 +1,11 @@ // easyxml.cxx - implementation of EasyXML interfaces. +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + #include "easyxml.hxx" #include "xmlparse.h" -- 2.39.5