Slight change to some STL stuff that was breaking MSVC6

diff --git a/src/ATC/ATCVoice.cxx b/src/ATC/ATCVoice.cxx
index c319bb4925b597b1888a45daf0a67e0b82a9aa43..0ebc217fb163871d6e8d182cc9762c121d68b2aa 100644 (file)
--- a/src/ATC/ATCVoice.cxx
+++ b/src/ATC/ATCVoice.cxx
@@ -96,6 +96,9 @@ bool FGATCVoice::LoadVoice(string voice) {
 }
 
 
+typedef list < string > tokenList_type;
+typedef tokenList_type::iterator tokenList_iterator;
+
 // Given a desired message, return a pointer to the data buffer and write the buffer length into len.
 unsigned char* FGATCVoice::WriteMessage(char* message, int& len, bool& dataOK) {
        
@@ -103,8 +106,8 @@ unsigned char* FGATCVoice::WriteMessage(char* message, int& len, bool& dataOK) {
        // First - parse the message into a list of tokens.
        // Sort the tokens into those we understand and those we don't.
        // Add all the raw lengths of the token sound data, allocate enough space, and fill it with the rqd data.
-       list < string > tokenList;
-       list < string >::iterator tokenListItr;
+       tokenList_type tokenList;
+       tokenList_iterator tokenListItr;
 
        // TODO - at the moment we're effectively taking 3 passes through the data.
        // There is no need for this - 2 should be sufficient - we can probably ditch the tokenList.

diff --git a/src/ATC/tower.hxx b/src/ATC/tower.hxx
index 8b38f371ae3213fbba5760aed0e0aa66a6942d06..1aa78d040e8eddcfd4a390bb602c840e29c016ea 100644 (file)
--- a/src/ATC/tower.hxx
+++ b/src/ATC/tower.hxx
@@ -67,8 +67,8 @@ class TowerPlaneRec {
 };
 
 typedef list < TowerPlaneRec* > tower_plane_rec_list_type;
-typedef list < TowerPlaneRec* >::iterator tower_plane_rec_list_iterator;
-typedef list < TowerPlaneRec* >::const_iterator tower_plane_rec_list_const_iterator;
+typedef tower_plane_rec_list_type::iterator tower_plane_rec_list_iterator;
+typedef tower_plane_rec_list_type::const_iterator tower_plane_rec_list_const_iterator;
 
 
 class FGTower : public FGATC {