Merge branch 'tbm/graphics-bug' into next

[flightgear.git] / src / ATCDCL / ATCVoice.hxx

diff --git a/src/ATCDCL/ATCVoice.hxx b/src/ATCDCL/ATCVoice.hxx
index a5ea59394f084a3e9eb46d03fa00639ab516e5e2..bdd2b0a491002a6dd5b46893f57818cc2ef3a42f 100644 (file)
--- a/src/ATCDCL/ATCVoice.hxx
+++ b/src/ATCDCL/ATCVoice.hxx
@@ -23,28 +23,16 @@
 
 #include <simgear/compiler.h>
 
-#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
-#  include <iostream>
-#else
-#  include <fstream.h>
-#  include <iostream.h>
-#endif
-
 #include <map>
 #include <list>
 #include <string>
 
 #include <simgear/sound/sample_openal.hxx>
 
-SG_USING_STD(map);
-SG_USING_STD(list);
-SG_USING_STD(string);
-
-SG_USING_STD(cout);
-SG_USING_STD(ios);
-SG_USING_STD(ofstream);
-SG_USING_STD(ifstream);
+using std::map;
+using std::list;
+using std::string;
 
 
 struct WordData {
@@ -52,7 +40,7 @@ struct WordData {
        unsigned int length;    // Byte length of word sample
 };
 
-typedef map < string, WordData > atc_word_map_type;
+typedef std::map < std::string, WordData > atc_word_map_type;
 typedef atc_word_map_type::iterator atc_word_map_iterator;
 typedef atc_word_map_type::const_iterator atc_word_map_const_iterator;
 
@@ -65,7 +53,7 @@ public:
 
        // Load the two voice files - one containing the raw sound data (.wav) and one containing the word positions (.vce).
        // Return true if successful.   
-       bool LoadVoice(const string& voice);
+       bool LoadVoice(const std::string& voice);
        
        // Given a desired message, return a pointer to the data buffer and write the buffer length into len.
        // Sets dataOK = true if the returned buffer is valid.