From 9eeda7d33935fd31cb551ca8c8787f16e6f5944d Mon Sep 17 00:00:00 2001 From: Torsten Dreyer <torsten@t3r.de> Date: Sun, 3 Feb 2019 19:32:57 +0100 Subject: [PATCH] unboost the environment --- src/Environment/atmosphere.cxx | 6 ++---- src/Environment/environment.cxx | 4 +--- src/Environment/realwx_ctrl.cxx | 7 ++++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Environment/atmosphere.cxx b/src/Environment/atmosphere.cxx index a6720c241..0c0b044df 100644 --- a/src/Environment/atmosphere.cxx +++ b/src/Environment/atmosphere.cxx @@ -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: " diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx index 09deca584..b0dce9a79 100644 --- a/src/Environment/environment.cxx +++ b/src/Environment/environment.cxx @@ -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; diff --git a/src/Environment/realwx_ctrl.cxx b/src/Environment/realwx_ctrl.cxx index 5a4c54a9b..fe5f77b67 100644 --- a/src/Environment/realwx_ctrl.cxx +++ b/src/Environment/realwx_ctrl.cxx @@ -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 (