From 59ccf90a601edcbfe5e4909a72e5af48b0ff6565 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 14 Aug 2001 19:47:40 +0000 Subject: [PATCH] Misc tweaks. --- src/Autopilot/newauto.cxx | 2 +- src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp | 2 +- src/FDM/UIUCModel/uiuc_parsefile.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx index 2d27bf059..ff6584175 100644 --- a/src/Autopilot/newauto.cxx +++ b/src/Autopilot/newauto.cxx @@ -698,7 +698,7 @@ int FGAutopilot::run() { total_adj = -1.0; } - globals->get_controls()->set_elevator( total_adj ); + globals->get_controls()->set_elevator_trim( total_adj ); } // auto throttle diff --git a/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp b/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp index 97c74229a..0d4293934 100644 --- a/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp +++ b/src/FDM/UIUCModel/uiuc_1Dinterpolation.cpp @@ -70,7 +70,7 @@ USA or view http://www.gnu.org/copyleft/gpl.html. **********************************************************************/ -#include // to disable C4244 d to f warning +#include // MSVC: to disable C4244 d to f warning #include "uiuc_1Dinterpolation.h" diff --git a/src/FDM/UIUCModel/uiuc_parsefile.cpp b/src/FDM/UIUCModel/uiuc_parsefile.cpp index b09d41e01..d74caa281 100644 --- a/src/FDM/UIUCModel/uiuc_parsefile.cpp +++ b/src/FDM/UIUCModel/uiuc_parsefile.cpp @@ -80,7 +80,7 @@ ParseFile :: ~ParseFile () void ParseFile :: removeComments(string& inputLine) { - unsigned int pos = inputLine.find_first_of(COMMENT); + int pos = inputLine.find_first_of(COMMENT); if (pos != inputLine.npos) // a "#" exists in the line { @@ -94,8 +94,8 @@ void ParseFile :: removeComments(string& inputLine) string ParseFile :: getToken(string inputLine, int tokenNo) { - unsigned int pos = 0; - unsigned int pos1 = 0; + int pos = 0; + int pos1 = 0; int tokencounter = 0; while (tokencounter < tokenNo) @@ -118,7 +118,7 @@ string ParseFile :: getToken(string inputLine, int tokenNo) void ParseFile :: storeCommands(string inputLine) { - unsigned int pos; + int pos; int pos1; // int wordlength; string line;