Merge branch 'timoore/mat-effect'

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

diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index e37fa722198e8104f3989e54f7589842e6ca6e1c..85a92e1c1aac1f2ea3bb4685b5ce83c3c6a7315f 100644 (file)
--- 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,17 +36,11 @@
 
 #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);
+using std::string;
 
 /**
  * A serial I/O class based on SGIOChannel.
@@ -55,7 +49,7 @@ class SGSerial : public SGIOChannel {
 
     string device;
     string baud;
-    FGSerialPort port;
+    SGSerialPort port;
 
     char save_buf[ 2 * SG_IO_MAX_MSG_SIZE ];
     int save_len;
@@ -97,10 +91,10 @@ public:
     // close port
     bool close();
 
-    /** Return the serial port device name */
+    /** @return the serial port device name */
     inline string get_device() const { return device; }
 
-    /** Return the baud rate */
+    /** @return the baud rate */
     inline string get_baud() const { return baud; }
 };