From 7dc8db8ef5b72daed46ebac8aee3423cfc48e91e Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 3 Apr 2012 22:24:00 +0200 Subject: [PATCH] Fix some compiler warnings. Also removes "itm.cpp" from CMake to avoid code duplication/warnings, since this the file is already included by radio.cxx. --- src/ATC/trafficcontrol.cxx | 8 ++++---- src/FDM/ExternalPipe/ExternalPipe.cxx | 5 +++++ src/Radio/CMakeLists.txt | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ATC/trafficcontrol.cxx b/src/ATC/trafficcontrol.cxx index fb15674cd..1ef59c9b7 100644 --- a/src/ATC/trafficcontrol.cxx +++ b/src/ATC/trafficcontrol.cxx @@ -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 { diff --git a/src/FDM/ExternalPipe/ExternalPipe.cxx b/src/FDM/ExternalPipe/ExternalPipe.cxx index abe656960..0a7377a4d 100644 --- a/src/FDM/ExternalPipe/ExternalPipe.cxx +++ b/src/FDM/ExternalPipe/ExternalPipe.cxx @@ -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 } diff --git a/src/Radio/CMakeLists.txt b/src/Radio/CMakeLists.txt index 72b1705f5..a1221aef7 100644 --- a/src/Radio/CMakeLists.txt +++ b/src/Radio/CMakeLists.txt @@ -3,7 +3,6 @@ include(FlightGearComponent) set(SOURCES antenna.cxx radio.cxx - itm.cpp ) set(HEADERS -- 2.39.5