1
0
Fork 0

gcc warning fixes

This commit is contained in:
Torsten Dreyer 2010-06-26 21:24:46 +02:00
parent f7d0a7bd39
commit 2e6d7e111a
7 changed files with 21 additions and 19 deletions

View file

@ -69,8 +69,8 @@ bool FGCommList::init( const SGPath& path ) {
LoadComms(temp);
temp = path;
temp.append( "ATC/default.approach" );
LoadComms(temp);
return true;*/
LoadComms(temp);*/
return true;
}
@ -107,9 +107,8 @@ bool FGCommList::LoadComms(const SGPath& path) {
fin >> skipcomment;
}
fin.close();
fin.close();*/
return true;
*/
}
@ -160,13 +159,14 @@ bool FGCommList::FindByFreq(const SGGeod& aPos, double freq,
return false;
}
*/
return false;
}
int FGCommList::FindByPos(const SGGeod& aPos, double range, comm_list_type* stations, atc_type tp)
{
/*
// number of relevant stations found within range
int found = 0;
/*
stations->erase(stations->begin(), stations->end());
// get bucket number for plane position
@ -203,8 +203,8 @@ int FGCommList::FindByPos(const SGGeod& aPos, double range, comm_list_type* stat
}
}
}
return found;
*/
return found;
}
@ -248,8 +248,8 @@ double FGCommList::FindClosest(const SGGeod& aPos, ATCData& ad, atc_type tp, dou
}
range *= 10;
}
return(-9999.0);
*/
return(-9999.0);
}
@ -277,8 +277,8 @@ bool FGCommList::FindByCode( const string& ICAO, ATCData& ad, atc_type tp ) {
}
}
}
return false;
*/
return false;
}
// TODO - this function should move somewhere else eventually!
@ -312,6 +312,7 @@ int FGCommList::GetAtisSequence( const string& apt_id,
// << " Delta: " << delta << endl;
return(tran.sequence + (delta ? 0 : LTRS*1000));
*/
return 2600;
}
/*****************************************************************************
* FGKln89AlignedProjection
@ -369,4 +370,4 @@ SGGeod FGKln89AlignedProjection::ConvertFromLocal(const SGVec3d& pt) {
return SGGeod::fromRadM(_origin.getLongitudeRad()+delta_lon, _origin.getLatitudeRad()+delta_lat, pt.z());
}
#endif // #ENABLE_ATCDCL
#endif // #ENABLE_ATCDCL

View file

@ -38,15 +38,16 @@ FGTrafficRecord::FGTrafficRecord() :
id(0), waitsForId(0),
currentPos(0),
leg(0),
frequencyId(0),
state(0),
allowTransmission(true),
latitude(0),
longitude(0),
heading(0),
speed(0),
altitude(0),
radius(0),
frequencyId(0),
allowTransmission(true) {
radius(0)
{
}
void FGTrafficRecord::setPositionAndIntentions(int pos, FGAIFlightPlan *route)

View file

@ -1661,7 +1661,7 @@ fgParseArgs (int argc, char **argv)
cout << endl << "No. Device" << endl;
vector <const char*>devices = smgr.get_available_devices();
for (int i=0; i<devices.size(); i++) {
for (vector <const char*>::size_type i=0; i<devices.size(); i++) {
cout << i << ". \"" << devices[i] << "\"" << endl;
}
devices.clear();

View file

@ -354,7 +354,7 @@ FGAirRoute FGAirwayNetwork::findShortestRoute(int start, int end)
foundRoute = false;
totalDistance = 0;
FGNode *firstNode = findNode(start);
FGNode *lastNode = findNode(end);
//FGNode *lastNode = findNode(end);
//prevNode = prevPrevNode = -1;
//prevNode = start;
routes.clear();

View file

@ -666,8 +666,8 @@ findWithPartial(const NamedPositionedIndex& aIndex, const std::string& aName,
///////////////////////////////////////////////////////////////////////////////
FGPositioned::FGPositioned(Type ty, const std::string& aIdent, const SGGeod& aPos, bool aIndexed) :
mType(ty),
mPosition(aPos),
mType(ty),
mIdent(aIdent)
{
SGReferenced::get(this); // hold an owning ref, for the moment

View file

@ -55,8 +55,8 @@ static int serial_send( SGSerialPort *serial, int sequence,
unsigned int result = serial->write_port( package.c_str(),
package.length() );
if ( result != package.length() ) {
printf("ERROR: wrote %d of %d bytes to serial port!\n",
result, package.length() );
printf("ERROR: wrote %u of %u bytes to serial port!\n",
result, (unsigned)package.length() );
return 0;
}
@ -88,7 +88,7 @@ int UGCommand::update( SGSerialPort *serial )
// send the command
string command = cmd_queue.front();
int result = serial_send( serial, cmd_send_index, command );
/*int result =*/ serial_send( serial, cmd_send_index, command );
return cmd_send_index;
}

View file

@ -276,7 +276,7 @@ static void gps2fg( const GPSPoint p, FGNetFDM *fdm, FGNetCtrls *ctrls )
static void send_data( const GPSPoint p ) {
int len;
int ctrlsize = sizeof( FGNetCtrls );
// int ctrlsize = sizeof( FGNetCtrls );
int fdmsize = sizeof( FGNetFDM );
// cout << "Running main loop" << endl;