X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Fvoice.hxx;h=4bde11d1e931507ec43705dd60c2c3ee1d9ac052;hb=7132947d167d15b7a5ff8ae196207aeadb538232;hp=117ee3aadeaeadf42889f8931705b5696932426b;hpb=a9319336badc474eb794af891b3bd6c63a81a62d;p=flightgear.git

diff --git a/src/Sound/voice.hxx b/src/Sound/voice.hxx
index 117ee3aad..4bde11d1e 100644
--- a/src/Sound/voice.hxx
+++ b/src/Sound/voice.hxx
@@ -44,10 +44,9 @@
 #  include <simgear/threads/SGQueue.hxx>
 #else
 #  include <queue>
-   SG_USING_STD(queue);
 #endif // ENABLE_THREADS
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 
@@ -66,12 +65,12 @@ private:
 	FGVoiceThread *_thread;
 #endif
 
-	string _host;
-	string _port;
+  std::string _host;
+  std::string _port;
 	bool _enabled;
 	SGPropertyNode_ptr _pausedNode;
 	bool _paused;
-	vector<FGVoice *> _voices;
+  std::vector<FGVoice *> _voices;
 };
 
 
@@ -102,7 +101,7 @@ public:
 	void setVolume(double);
 	void setPitch(double);
 	void setSpeed(double);
-	void pushMessage(string);
+	void pushMessage(std::string);
 
 private:
 	class FGVoiceListener;
@@ -117,9 +116,9 @@ private:
 	FGVoiceMgr *_mgr;
 
 #if defined(ENABLE_THREADS)
-	SGLockedQueue<string> _msg;
+	SGLockedQueue<std::string> _msg;
 #else
-	queue<string> _msg;
+  std::queue<std::string> _msg;
 #endif
 
 };