Frederic Bouvier:

[flightgear.git] / src / FDM / JSBSim / FGScript.cpp

diff --git a/src/FDM/JSBSim/FGScript.cpp b/src/FDM/JSBSim/FGScript.cpp
index f17221325dad15764aa2618cf94caad4f9aefe8a..7c9ec35ddd6d19507cc26cf6d055852d97bba187 100644 (file)
--- a/src/FDM/JSBSim/FGScript.cpp
+++ b/src/FDM/JSBSim/FGScript.cpp
@@ -46,7 +46,7 @@ INCLUDES
 #  include STL_IOSTREAM
 #  include STL_ITERATOR
 #else
-#  if defined(sgi) && !defined(__GNUC__)
+#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
 #    include <iostream.h>
 #  else
 #    include <iostream>
@@ -57,6 +57,8 @@ INCLUDES
 #include "FGScript.h"
 #include "FGConfigFile.h"
 
+namespace JSBSim {
+
 static const char *IdSrc = "$Id$";
 static const char *IdHdr = ID_FGSCRIPT;
 
@@ -415,4 +417,4 @@ void FGScript::Debug(int from)
     }
   }
 }
-
+}