Tweaks for Mips Irix compilers.

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 8123c3f977428e1e1c86d888ff2c08f0e81e7687..0e395a31c08a2cf29a49739f81dd16eaf15ad733 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -27,13 +27,14 @@
 #endif
 
 #include <simgear/compiler.h>
+
 #include <simgear/misc/fgpath.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/props.hxx>
 
-#include <iostream>
-#include <fstream>
-#include <string>
+#include STL_IOSTREAM
+#include STL_FSTREAM
+#include STL_STRING
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -42,8 +43,10 @@
 #include "steam.hxx"
 #include "panel_io.hxx"
 
+#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS)
 FG_USING_STD(istream);
 FG_USING_STD(ifstream);
+#endif
 FG_USING_STD(string);
 
 
@@ -353,7 +356,7 @@ readTransformation (const SGPropertyNode * node, float hscale, float vscale)
     type = "rotation";
   }
 
-  if (propName != "") {
+  if (propName != (string)"") {
     value = fgGetValue(propName, true);
   }
 

diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx
index 6e53bd1ba7ffd28b527438d234b5361d1f84fb1a..5d0d56c08900909b76f3264ae9238dfdd1e306bf 100644 (file)
--- a/src/Cockpit/panel_io.hxx
+++ b/src/Cockpit/panel_io.hxx
@@ -29,11 +29,15 @@
 #  include <windows.h>
 #endif
 
-#include <iostream>
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 
 #include "panel.hxx"
 
-using std::istream;
+#if !defined (FG_HAVE_NATIVE_SGI_COMPILERS)
+FG_USING_STD(istream);
+#endif
 
 extern FGPanel * fgReadPanel (istream &input);
 extern FGPanel * fgReadPanel (const string &relative_path);

diff --git a/src/WeatherCM/FGPhysicalProperties.h b/src/WeatherCM/FGPhysicalProperties.h
index 5c50c77e949fd4b090230327028df640a007d5c5..d93796e118bb650905fa7754bdaaad575ce0860d 100644 (file)
--- a/src/WeatherCM/FGPhysicalProperties.h
+++ b/src/WeatherCM/FGPhysicalProperties.h
@@ -63,7 +63,7 @@ HISTORY
 #  include <windows.h>
 #endif
 
-#include <iostream>
+#include STL_IOSTREAM
 #include <vector>
 #include <map>
 

diff --git a/tests/test-up.cxx b/tests/test-up.cxx
index 9564720b87d2cca0a56e4af7f077e54a9ec8051e..96fb2c3411a237d8f5ed784d0bfa42bfe5bc5f8c 100644 (file)
--- a/tests/test-up.cxx
+++ b/tests/test-up.cxx
@@ -1,6 +1,8 @@
 // do some test relating to the concept of "up"
 
-#include <iostream>
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 
 #include <plib/sg.h>