Patch from Erik Hofman:

[simgear.git] / simgear / math / sg_geodesy.cxx

diff --git a/simgear/math/sg_geodesy.cxx b/simgear/math/sg_geodesy.cxx
index 9d30f09214c3e2f1ffa63b4a7a7ac43747c95f51..cc5ac15ce6374c4ba81d83e1554a8bd6257a9c36 100644 (file)
--- a/simgear/math/sg_geodesy.cxx
+++ b/simgear/math/sg_geodesy.cxx
@@ -27,9 +27,7 @@
 #include "localconsts.hxx"
 
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(cout);
-#endif
 
 
 #define DOMAIN_ERR_DEBUG 1
@@ -71,7 +69,7 @@ void sgGeocToGeod( double lat_geoc, double radius, double
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" << t_lat*t_lat + E*E << ")" );
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" << t_lat*t_lat + E*E << ")" );
        }
 #endif
        // cout << "  x_alpha = " << x_alpha << endl;
@@ -80,7 +78,7 @@ void sgGeocToGeod( double lat_geoc, double radius, double
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" << SG_EQ_RAD_SQUARE_M - x_alpha * x_alpha
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" << SG_EQ_RAD_SQUARE_M - x_alpha * x_alpha
                    << ")" );
        }
 #endif
@@ -96,7 +94,7 @@ void sgGeocToGeod( double lat_geoc, double radius, double
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" <<
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
                    1-EPS*EPS*sin_mu_a*sin_mu_a << ")" );
        }
 #endif
@@ -111,7 +109,7 @@ void sgGeocToGeod( double lat_geoc, double radius, double
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeocToGeod()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" <<
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
                    SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
                    << ")" );
        }
@@ -153,7 +151,7 @@ void sgGeodToGeoc( double lat_geod, double alt, double *sl_radius,
 #ifdef DOMAIN_ERR_DEBUG
        if ( errno ) {
            perror("fgGeodToGeoc()");
-           FG_LOG( FG_GENERAL, FG_ALERT, "sqrt(" <<
+           SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
                    SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
                    << ")" );
        }