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 b5a2cbb1718f7dee12b231968de7b92246d8ab31..c4eff1b8b95850ffdd0ce10f73461dca7ca4ea47 100644 (file)
--- a/src/Main/fg_io.hxx
+++ b/src/Main/fg_io.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -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;
 
@@ -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;
 };