Merge branch 'topic/tape' into next

[flightgear.git] / src / Main / fg_io.hxx

diff --git a/src/Main/fg_io.hxx b/src/Main/fg_io.hxx
index 146f57087537098e3fee3595c94fbea0ba98a022..ca6f0f78bcae60be8ec0ff9b735aee116fc1f7c4 100644 (file)
--- a/src/Main/fg_io.hxx
+++ b/src/Main/fg_io.hxx
@@ -29,10 +29,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 
 #include <vector>
-#include STL_STRING
-
-SG_USING_STD(vector);
-SG_USING_STD(string);
+#include <string>
 
 class FGProtocol;
 
@@ -51,13 +48,13 @@ public:
 
 private:
 
-    FGProtocol* parse_port_config( const string& cfgstr );
+    FGProtocol* parse_port_config( const std::string& cfgstr );
 
 private:
 
     // define the global I/O channel list
     //io_container global_io_list;
-    vector< FGProtocol* > io_channels;
+    std::vector< FGProtocol* > io_channels;
 };