Patch from Melchior Franz:

[simgear.git] / simgear / sky / sphere.cxx

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index 442c434135e1ab93e76e5b0b7eda480d837dc2fc..428d966b3ba05652ac3904e1d429df174ca13b2e 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -23,10 +23,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM
@@ -34,7 +30,11 @@
 #include <plib/sg.h>
 #include <plib/ssg.h>
 
-FG_USING_NAMESPACE(std);
+#if !defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(cout);
+SG_USING_STD(endl);
+#endif
+
 
 // return a sphere object as an ssgBranch
 ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
@@ -50,8 +50,8 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
     sgVec2 vec2;
     sgVec3 vec3;
 
-    drho = SG_PI / (float) stacks;
-    dtheta = 2.0 * SG_PI / (float) slices;
+    drho = SGD_PI / (float) stacks;
+    dtheta = 2.0 * SGD_PI / (float) slices;
 
     /* texturing: s goes from 0.0/0.25/0.5/0.75/1.0 at +y/+x/-y/-x/+y
        axis t goes from -1.0/+1.0 at z = -radius/+radius (linear along
@@ -114,11 +114,11 @@ ssgBranch *ssgMakeSphere( ssgSimpleState *state, ssgColourArray *cl,
            new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, cl );
 
        if ( vl->getNum() != nl->getNum() ) {
-           std::cout << "bad sphere1\n";
+           cout << "bad sphere1" << endl;
            exit(-1);
        }
        if ( vl->getNum() != tl->getNum() ) {
-           std::cout << "bad sphere2\n";
+           cout << "bad sphere2" << endl;
            exit(-1);
        }
        slice->setState( state );