Updates from JSBSim, including new turbine engine model from David Culp

[flightgear.git] / src / FDM / JSBSim / FGfdmSocket.h

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index df9c3ec7b6ef9c7dec7e0cea3f83594a42e917f2..ff6ef5562684cdd260a9701ffeac93b73ef73a0e 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -49,10 +49,8 @@ INCLUDES
 #  include STL_STRING
 #  include STL_IOSTREAM
 #  include STL_FSTREAM
-#  if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-     SG_USING_STD(cout);
-     SG_USING_STD(endl);
-#  endif
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
 #  include <string>
 #  if defined(sgi) && !defined(__GNUC__)
@@ -90,6 +88,8 @@ CLASS DECLARATION
 
 using std::string;
 
+namespace JSBSim {
+
 class FGfdmSocket : public FGJSBBase
 {
 public:
@@ -111,5 +111,5 @@ private:
   bool connected;
   void Debug(int from);
 };
-
+}
 #endif