fly/flightgear
1
0
Fork 0
Code Activity

Fix for C++11 using simgear::strutils::lowercase

Browse source
This commit is contained in:
Stuart Buchanan 2020-04-18 22:00:04 +01:00
parent d96d903c0b
commit 682293c0d0
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Main/positioninit.cxx
View file

@ -24,6 +24,7 @@
#include <osg/PagedLOD> #include <osg/PagedLOD>
// simgear // simgear
#include <simgear/misc/strutils.hxx>
#include <simgear/props/props_io.hxx> #include <simgear/props/props_io.hxx>
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>
#include <simgear/structure/event_mgr.hxx> #include <simgear/structure/event_mgr.hxx>
@ -835,11 +836,11 @@ void finalizePosition()
* loaded. => When requested "initial preset position" relates to a * loaded. => When requested "initial preset position" relates to a
* carrier, recalculate the 'initial' position here * carrier, recalculate the 'initial' position here
*/ */
std::string carrier = fgGetString("/sim/presets/carrier"); const std::string carrier = fgGetString("/sim/presets/carrier");
std::string carrierpos = fgGetString("/sim/presets/carrier-position"); const std::string carrierpos = fgGetString("/sim/presets/carrier-position");
std::string parkpos = fgGetString("/sim/presets/parkpos"); const std::string parkpos = fgGetString("/sim/presets/parkpos");
std::string runway = fgGetString("/sim/presets/runway"); const std::string runway = fgGetString("/sim/presets/runway");
std::string apt = fgGetString("/sim/presets/airport-id"); const std::string apt = fgGetString("/sim/presets/airport-id");
if (!carrier.empty()) if (!carrier.empty())
{ {
@ -851,20 +852,17 @@ void finalizePosition()
*/ */
// Convert to lower case to simplify comparison // Convert to lower case to simplify comparison
std::transform(carrierpos.begin(), std::string cpos = simgear::strutils::lowercase(carrierpos);
carrierpos.end(),
carrierpos.begin(),
[](unsigned char c) { return std::tolower(c); });
const bool inair = (carrierpos == "flols") || (carrierpos == "abeam"); const bool inair = (cpos == "flols") || (cpos == "abeam");
const bool abeam = (carrierpos == "abeam"); const bool abeam = (cpos == "abeam");
InitPosResult carrierResult; InitPosResult carrierResult;
if (inair) { if (inair) {
carrierResult = setFinalPosFromCarrierFLOLS(carrier, abeam); carrierResult = setFinalPosFromCarrierFLOLS(carrier, abeam);
} else { } else {
// We don't simply use carrierpos as it is now lower case, and the // We don't simply use cpos as it is lower case, and the
// search against parking/catapult positions is case-sensitive. // search against parking/catapult positions is case-sensitive.
carrierResult = setFinalPosFromCarrier(carrier, fgGetString("/sim/presets/carrier-position")); carrierResult = setFinalPosFromCarrier(carrier, carrierpos);
} }
if (carrierResult == ExactPosition) { if (carrierResult == ExactPosition) {
done = true; done = true;