Merge branch 'work4' into next

[flightgear.git] / src / Network / joyclient.hxx

diff --git a/src/Network/joyclient.hxx b/src/Network/joyclient.hxx
index 0a2f7485af96b91550ae0bdd360e39b0d4ea5212..818081e1baa0f4a007b23a0964818d6023b53324 100644 (file)
--- a/src/Network/joyclient.hxx
+++ b/src/Network/joyclient.hxx
@@ -33,7 +33,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGJoyClient : public FGProtocol {