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 b7c8553d0dd86ce38d782e9dc2a45bcecc761ca9..85a92e1c1aac1f2ea3bb4685b5ce83c3c6a7315f 100644 (file)
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -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.