Merge branch 'curt/make' into next

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

diff --git a/src/Main/fg_io.hxx b/src/Main/fg_io.hxx
index b0da8f0d9f65619ff19b820f295c588e647c8b1b..c4eff1b8b95850ffdd0ce10f73461dca7ca4ea47 100644 (file)
--- a/src/Main/fg_io.hxx
+++ b/src/Main/fg_io.hxx
@@ -31,9 +31,6 @@
 #include <vector>
 #include <string>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
-
 class FGProtocol;
 
 class FGIO : public SGSubsystem
@@ -43,6 +40,7 @@ public:
     ~FGIO();
 
     void init();
+    void reinit();
     void bind();
     void unbind();
     void update( double dt );
@@ -51,13 +49,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;
 };