From: <sv...@ww...> - 2004-06-29 10:54:18
|
Author: delta Date: 2004-06-29 03:54:12 -0700 (Tue, 29 Jun 2004) New Revision: 1107 Modified: trunk/CSP/CSPSim/Source/Systems/AircraftInputSystem.cpp Log: min/max workaround. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1107 Modified: trunk/CSP/CSPSim/Source/Systems/AircraftInputSystem.cpp =================================================================== --- trunk/CSP/CSPSim/Source/Systems/AircraftInputSystem.cpp 2004-06-29 10:44:48 UTC (rev 1106) +++ trunk/CSP/CSPSim/Source/Systems/AircraftInputSystem.cpp 2004-06-29 10:54:12 UTC (rev 1107) @@ -23,7 +23,7 @@ **/ -#include <Systems/AircraftInputSystem.h> +#include "Systems/AircraftInputSystem.h" SIMDATA_REGISTER_INTERFACE(AircraftInputSystem) @@ -227,12 +227,12 @@ } void AircraftInputSystem::DecAirbrake() { - double v = std::max(0.0, m_AirbrakeInput.getValue() - 0.1); + double v = std::max<double>(0.0, m_AirbrakeInput.getValue() - 0.1); m_AirbrakeInput.setValue(v); } void AircraftInputSystem::IncAirbrake() { - double v = std::min(0.0, m_AirbrakeInput.getValue() + 0.1); + double v = std::min<double>(0.0, m_AirbrakeInput.getValue() + 0.1); m_AirbrakeInput.setValue(v); } |