From 9c96e109a39536539809e317a80f05d4a993d0ef Mon Sep 17 00:00:00 2001
From: daveluff <daveluff>
Date: Fri, 17 Jan 2003 16:45:26 +0000
Subject: [PATCH] Slight change to some STL stuff that was breaking MSVC6
---
src/ATC/ATCVoice.cxx | 7 +++++--
src/ATC/tower.hxx | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/ATC/ATCVoice.cxx b/src/ATC/ATCVoice.cxx
index c319bb492..0ebc217fb 100644
--- 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 8b38f371a..1aa78d040 100644
--- 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 {