SGPath: fix creating paths with permission checker.

[simgear.git] / simgear / io / sg_serial.hxx

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index b7c8553d0dd86ce38d782e9dc2a45bcecc761ca9..e02ace643c54a112787ea2aa95ddb0506e7ee456 100644 (file)
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -36,25 +36,17 @@
 
 #include <string>
 
-// #ifdef SG_HAVE_STD_INCLUDES
-// #  include <ctime>
-// #else
-// #  include <time.h>
-// #endif
-
 #include <simgear/serial/serial.hxx>
 
 #include "iochannel.hxx"
 
-SG_USING_STD(string);
-
 /**
  * A serial I/O class based on SGIOChannel.
  */
 class SGSerial : public SGIOChannel {
 
-    string device;
-    string baud;
+    std::string device;
+    std::string baud;
     SGSerialPort port;
 
     char save_buf[ 2 * SG_IO_MAX_MSG_SIZE ];
@@ -74,7 +66,7 @@ public:
      * @param device_name name of serial device
      * @param baud_rate speed of communication
      */
-    SGSerial( const string& device_name, const string& baud_rate );
+    SGSerial( const std::string& device_name, const std::string& baud_rate );
 
     /** Destructor */
     ~SGSerial();