fly/flightgear
1
0
Fork 0
Code Activity

unboost the environment

Browse source
This commit is contained in:
Torsten Dreyer 2019-02-03 19:32:57 +01:00
parent 983227f18f
commit 9eeda7d339
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Environment/atmosphere.cxx
View file

@ -1,5 +1,3 @@
#include <boost/tuple/tuple.hpp>
#include <simgear/math/SGMath.hxx>
#include <simgear/debug/logstream.hxx>
@ -161,7 +159,7 @@ void FGAtmoCache::tabulate() {
for (double hgt = -1000; hgt <= 32000;) {
double press,temp;
boost::tie(press, temp) = PT_vs_hpt(hgt);
std::tie(press, temp) = PT_vs_hpt(hgt);
a_tvs_p->addEntry(press / inHg, hgt / foot);
#ifdef DEBUG_EXPORT_P_H
@ -213,7 +211,7 @@ void FGAtmoCache::check_model() {
using namespace atmodel;
cache();
double press,temp;
boost::tie(press, temp) = PT_vs_hpt(height);
std::tie(press, temp) = PT_vs_hpt(height);
cout << "Height: " << height
<< " \tpressure: " << press << endl;
cout << "Check: "

4
src/Environment/environment.cxx
View file

@ -25,8 +25,6 @@
#include <cmath>
#include <boost/tuple/tuple.hpp>
#include <simgear/props/props.hxx>
#include <simgear/math/SGMath.hxx>
@ -756,7 +754,7 @@ FGEnvironment::_recalc_alt_pt ()
#endif
double press = pressure_inhg * inHg;
double temp = temperature_degc + freezing;
boost::tie(press, temp) = PT_vs_hpt(elevation_ft * foot,
std::tie(press, temp) = PT_vs_hpt(elevation_ft * foot,
pressure_sea_level_inhg * inHg, temperature_sea_level_degc + freezing);
temperature_degc = temp - freezing;
pressure_inhg = press / inHg;

7
src/Environment/realwx_ctrl.cxx
View file

@ -27,7 +27,6 @@
#include "realwx_ctrl.hxx"
#include <algorithm>
#include <boost/algorithm/string/case_conv.hpp>
#include <simgear/structure/exception.hxx>
#include <simgear/misc/strutils.hxx>
@ -205,7 +204,8 @@ static bool commandRequestMetar(const SGPropertyNode * arg, SGPropertyNode * roo
}
string icao(arg->getStringValue("station"));
boost::to_upper(icao);
std::transform(icao.begin(), icao.end(), icao.begin(), static_cast<int(*)(int)>(std::tolower));
string path = arg->getStringValue("path");
self->addMetarAtPath(path, icao);
return true;
@ -469,7 +469,8 @@ void NoaaMetarRealWxController::requestMetar
LiveMetarProperties_ptr _metarDataHandler;
};
string upperId = boost::to_upper_copy(id);
string upperId = id;
std::transform(upperId.begin(), upperId.end(), upperId.begin(), static_cast<int(*)(int)>(std::tolower));
SG_LOG
(