JSBSim tweaks.

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

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index f40429e83fce7e401147bfcd6dd60bb956af0a6a..803c01f5747364e35e1b187ee01aa9f31cc73622 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -45,22 +45,20 @@ INCLUDES
 #include <stdio.h>
 
 #ifdef FGFS
-#  pragma message("FGFS defined")
 #  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <iostream>
-#    include <fstream>
-#  else
-#    include <iostream.h>
-#    include <fstream.h>
-#  endif
+#  include STL_STRING
+#  include STL_IOSTREAM
+#  include STL_FSTREAM
+   SG_USING_STD(cout);
+   SG_USING_STD(endl);
 #else
-#  pragma message("FGFS not defined")
 #  include <iostream>
 #  include <fstream>
+#  include <string>
+   using std::cout;
+   using std::endl;
 #endif
 
-#include <string>
 #include <sys/types.h>
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
@@ -76,10 +74,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_FDMSOCKET "$Header"
-
-using std::cout;
-using std::endl;
+#define ID_FDMSOCKET "$Id$"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
@@ -90,7 +85,7 @@ using std::string;
 class FGfdmSocket {
 public:
   FGfdmSocket(string, int);
-  ~FGfdmSocket(void);
+  ~FGfdmSocket();
   void Send(void);
   void Append(const char*);
   void Append(float);