JSBSim tweaks.

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

diff --git a/src/FDM/JSBSim/FGfdmSocket.h b/src/FDM/JSBSim/FGfdmSocket.h
index e5064a519fa2d62e2815e3b82fd3f7ec1ad4563d..803c01f5747364e35e1b187ee01aa9f31cc73622 100644 (file)
--- a/src/FDM/JSBSim/FGfdmSocket.h
+++ b/src/FDM/JSBSim/FGfdmSocket.h
@@ -46,19 +46,19 @@ INCLUDES
 
 #ifdef FGFS
 #  include <simgear/compiler.h>
-#  ifdef FG_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
 #  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,9 +76,6 @@ DEFINITIONS
 
 #define ID_FDMSOCKET "$Id$"
 
-using std::cout;
-using std::endl;
-
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/