Merge branch 'next' of git://gitorious.org/fg/simgear into next

[simgear.git] / simgear / serial / testserial.cxx

diff --git a/simgear/serial/testserial.cxx b/simgear/serial/testserial.cxx
index d005f32fee3cc7c2df37a340d4fcd734c2ac7965..828be05371e981013226c76ede7a4e95f37cb173 100644 (file)
--- a/simgear/serial/testserial.cxx
+++ b/simgear/serial/testserial.cxx
@@ -1,20 +1,17 @@
 #include <simgear/compiler.h>
 
-#include STL_STRING
-#include STL_IOSTREAM
+#include <string>
+#include <iostream>
 
 #include <simgear/debug/logstream.hxx>
 
 #include "serial.hxx"
 
-#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-#endif
-
+using std::cout;
+using std::endl;
 
 int main () {
-    FGSerialPort port;
+    SGSerialPort port;
     string value;
     bool result;