Irix fixes.

diff --git a/src/WeatherCM/linintp2.cpp b/src/WeatherCM/linintp2.cpp
index 0c321f23c780d9e9cd456058efe6b5fcd32bbecd..10f610410ebcda2fca98c38f100197ec1f4585d7 100644 (file)
--- a/src/WeatherCM/linintp2.cpp
+++ b/src/WeatherCM/linintp2.cpp
@@ -30,15 +30,17 @@
 */
 
 #include <simgear/compiler.h>
-#include <iostream>
+#include STL_IOSTREAM
 
 #include <float.h>
 #include <math.h>
 #include <stdlib.h>
 #include "linintp2.h"
 
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_NAMESPACE(std);
 SG_USING_STD(cout);
+#endif
 
 //---------------------------------------------------------------------------
 mgcLinInterp2D::mgcLinInterp2D (int _numPoints, double* x, double* y, 

diff --git a/src/WeatherCM/sphrintp.cpp b/src/WeatherCM/sphrintp.cpp
index 41ff38c831e5d75dfe6764b0b58b3e77eb76297d..9740a8b7b72c4f6720235678f7de863759d0085f 100644 (file)
--- a/src/WeatherCM/sphrintp.cpp
+++ b/src/WeatherCM/sphrintp.cpp
@@ -30,13 +30,15 @@
 */
 
 #include <simgear/compiler.h>
-#include <iostream>
+#include STL_IOSTREAM
 
 #include <math.h>
 #include "sphrintp.h"
 
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_NAMESPACE(std);
 SG_USING_STD(cout);
+#endif
 
 
 static const double PI = 4.0*atan(1.0);

diff --git a/src/WeatherCM/sphrintp.h b/src/WeatherCM/sphrintp.h
index 4f0e781c966cfad34c03f52a17494c88de5273f1..cf60e9e0ca2a3c50e03e6b87d87f388752d947d0 100644 (file)
--- a/src/WeatherCM/sphrintp.h
+++ b/src/WeatherCM/sphrintp.h
@@ -33,13 +33,15 @@
 #define SPHRINTP_H
 
 #include <simgear/compiler.h>
-#include <iostream>
+#include STL_IOSTREAM
 
 #include "linintp2.h"
 #include <plib/sg.h>
 
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_NAMESPACE(std);
 SG_USING_STD(cout);
+#endif
 
 
 class SphereInterpolate