fly/flightgear
1
0
Fork 0
Code Activity

Fix some compiler warnings.

Browse source 
Also removes "itm.cpp" from CMake to avoid code duplication/warnings, since
this the file is already included by radio.cxx.
This commit is contained in:
ThorstenB 2012-04-03 22:24:00 +02:00
parent 8c74b47a0d
commit 7dc8db8ef5
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ATC/trafficcontrol.cxx
View file

@ -1328,7 +1328,7 @@ void FGStartupController::render(bool visible)
group = new osg::Group;
FGScenery * local_scenery = globals->get_scenery();
//double elevation_meters = 0.0;
double elevation_feet = 0.0;
//double elevation_feet = 0.0;
//for ( FGTaxiSegmentVectorIterator i = segments.begin(); i != segments.end(); i++) {
@ -1370,7 +1370,7 @@ void FGStartupController::render(bool visible)
SGGeod center2 = end;
center2.setElevationM(SG_MAX_ELEVATION_M);
if (local_scenery->get_elevation_m( center2, elevationEnd, NULL )) {
elevation_feet = elevationEnd * SG_METER_TO_FEET + 0.5;
//elevation_feet = elevationEnd * SG_METER_TO_FEET + 0.5;
//elevation_meters += 0.5;
}
else {
@ -1433,7 +1433,7 @@ void FGStartupController::render(bool visible)
SGGeod center2 = segment->getStart()->getGeod();
center2.setElevationM(SG_MAX_ELEVATION_M);
if (local_scenery->get_elevation_m( center2, elevationStart, NULL )) {
elevation_feet = elevationStart * SG_METER_TO_FEET + 0.5;
//elevation_feet = elevationStart * SG_METER_TO_FEET + 0.5;
//elevation_meters += 0.5;
}
else {
@ -1445,7 +1445,7 @@ void FGStartupController::render(bool visible)
SGGeod center2 = segment->getEnd()->getGeod();
center2.setElevationM(SG_MAX_ELEVATION_M);
if (local_scenery->get_elevation_m( center2, elevationEnd, NULL )) {
elevation_feet = elevationEnd * SG_METER_TO_FEET + 0.5;
//elevation_feet = elevationEnd * SG_METER_TO_FEET + 0.5;
//elevation_meters += 0.5;
}
else {

5
src/FDM/ExternalPipe/ExternalPipe.cxx
View file

@ -287,6 +287,8 @@ void FGExternalPipe::init_binary() {
fflush( pd1 );
SG_LOG( SG_IO, SG_ALERT, "Remote FDM init() finished." );
(void) result; // ignore result
}
@ -350,6 +352,8 @@ void FGExternalPipe::init_property() {
fflush( pd1 );
SG_LOG( SG_IO, SG_ALERT, "Remote FDM init() finished." );
(void) result; // ignore result
}
@ -573,6 +577,7 @@ void FGExternalPipe::update_property( double dt ) {
}
}
(void) result; // ignore result
#endif
}

1
src/Radio/CMakeLists.txt
View file

@ -3,7 +3,6 @@ include(FlightGearComponent)
set(SOURCES
antenna.cxx
radio.cxx
itm.cpp
)
set(HEADERS