blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 19:00:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GCC doesn't implement <format> yet, use fmt

Browse source
This commit is contained in:
Dan Paulat 2023-04-17 18:24:50 -05:00
parent 593010acc2
commit 31db9a4315
12 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wxdata/source/scwx/awips/ugc.cpp
View file

@ -84,7 +84,7 @@ std::vector<std::string> Ugc::fips_ids() const
{
for (auto& id : fipsIdList.second)
{
fipsIds.push_back(std::format("{}{}{:03}",
fipsIds.push_back(fmt::format("{}{}{:03}",
fipsIdList.first,
ugcFormatMap_.left.at(p->format_),
id));

7
wxdata/source/scwx/common/geographic.cpp
View file

@ -1,9 +1,10 @@
#include <scwx/common/geographic.hpp>
#include <scwx/common/characters.hpp>
#include <format>
#include <numbers>
#include <fmt/format.h>
namespace scwx
{
namespace common
@ -95,7 +96,7 @@ static std::string GetDegreeString(double degrees,
{
case DegreeStringType::Decimal:
degreeString =
std::format("{:.6f}{}{}", degrees, Unicode::kDegree, suffix);
fmt::format("{:.6f}{}{}", degrees, Unicode::kDegree, suffix);
break;
case DegreeStringType::DegreesMinutesSeconds:
{
@ -103,7 +104,7 @@ static std::string GetDegreeString(double degrees,
degrees = (degrees - dd) * 60.0;
uint32_t mm = static_cast<uint32_t>(degrees);
double ss = (degrees - mm) * 60.0;
degreeString = std::format(
degreeString = fmt::format(
"{}{} {}' {:.2f}\"{}", dd, Unicode::kDegree, mm, ss, suffix);
break;
}