fly/flightgear
1
0
Fork 0
Code Activity

Change waitingTiles from std::queue to std::deque

Browse source 
std::queue can't be cleared portably.
This commit is contained in:
Tim Moore 2009-02-02 00:38:34 +01:00
parent 155701aaeb
commit 7259d36abf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
utils/TerraSync/terrasync.cxx
View file

@ -36,7 +36,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <queue> #include <deque>
#include <plib/netSocket.h> #include <plib/netSocket.h>
#include <plib/ul.h> #include <plib/ul.h>
@ -88,7 +88,7 @@ static void usage( const string& prog ) {
#endif #endif
} }
std::queue<std::string> waitingTiles; std::deque<std::string> waitingTiles;
#ifdef HAVE_SVN_CLIENT_H #ifdef HAVE_SVN_CLIENT_H
@ -337,7 +337,7 @@ static void sync_area( int lat, int lon ) {
EW, abs(baselon), NS, abs(baselat), EW, abs(baselon), NS, abs(baselat),
EW, abs(lon), NS, abs(lat) ); EW, abs(lon), NS, abs(lat) );
waitingTiles.push( dir ); waitingTiles.push_back( dir );
} }
@ -452,7 +452,7 @@ int main( int argc, char **argv ) {
if ( recv_msg ) { if ( recv_msg ) {
if ( lat != last_lat || lon != last_lon ) { if ( lat != last_lat || lon != last_lon ) {
cout << "pos in msg = " << lat << "," << lon << endl; cout << "pos in msg = " << lat << "," << lon << endl;
waitingTiles.c.clear(); waitingTiles.clear();
int lat_dir, lon_dir, dist; int lat_dir, lon_dir, dist;
if ( last_lat == nowhere || last_lon == nowhere ) { if ( last_lat == nowhere || last_lon == nowhere ) {
lat_dir = lon_dir = 0; lat_dir = lon_dir = 0;
@ -485,7 +485,7 @@ int main( int argc, char **argv ) {
snprintf( dir, 512, "%s/%s", *tree, waitingTiles.front().c_str() ); snprintf( dir, 512, "%s/%s", *tree, waitingTiles.front().c_str() );
sync_tree(dir); sync_tree(dir);
} }
waitingTiles.pop(); waitingTiles.pop_front();
} else { } else {
char c; char c;
while ( !isdigit( c = synced_other++ ) && !isupper( c ) ); while ( !isdigit( c = synced_other++ ) && !isupper( c ) );