Merge branch 'timoore/effects-anim-rebase' into next

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

diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index a0392a34bb17e758fd67464976173b08ab1e57e9..d8a29608db20b2dbef3e6b2974bcce3881ab709a 100644 (file)
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.hxx
@@ -32,11 +32,11 @@
 
 // #include "protocol.hxx"
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 
 #define SG_IO_MAX_MSG_SIZE 16384