fly/flightgear
1
0
Fork 0
Code Activity

Slight change to some STL stuff that was breaking MSVC6

Browse source
This commit is contained in:
daveluff 2003-01-17 16:45:26 +00:00
parent 7c3df373af
commit 9c96e109a3
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ATC/ATCVoice.cxx
View file

@ -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.

4
src/ATC/tower.hxx
View file

@ -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 {