X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fio%2Fsg_serial.hxx;h=e02ace643c54a112787ea2aa95ddb0506e7ee456;hb=c199c952186357d53657e85c0b02cfd3f0100d7e;hp=b6e43cb7ead436b6ef1ea811f436c6f56f8b95f6;hpb=75911b6c643d8e5597565bc63c34bdc2009a037a;p=simgear.git

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index b6e43cb7..e02ace64 100644
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -19,7 +19,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$
 
@@ -36,26 +36,18 @@
 
 #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;
-    FGSerialPort port;
+    std::string device;
+    std::string baud;
+    SGSerialPort port;
 
     char save_buf[ 2 * SG_IO_MAX_MSG_SIZE ];
     int save_len;
@@ -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();