use std::format instead of fmt::format
The std::format is sufficient for the uses in this repository except
for in one file (override_fan_target.cpp, since P2286 isn't supported
by GCC yet). Switch to std::format whenever possible.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ib2576fb530a4d7ce238e1b0bd95b40b476ec2107
diff --git a/control/json/actions/mapped_floor.cpp b/control/json/actions/mapped_floor.cpp
index c947098..97f659f 100644
--- a/control/json/actions/mapped_floor.cpp
+++ b/control/json/actions/mapped_floor.cpp
@@ -20,11 +20,10 @@
#include "group.hpp"
#include "sdeventplus.hpp"
-#include <fmt/format.h>
-
#include <nlohmann/json.hpp>
#include <algorithm>
+#include <format>
namespace phosphor::fan::control::json
{
@@ -43,7 +42,7 @@
if (newFloor < 0)
{
log<level::ERR>(
- fmt::format("{}: Floor offset of {} resulted in negative floor",
+ std::format("{}: Floor offset of {} resulted in negative floor",
actionName, offset)
.c_str());
return floor;
@@ -72,7 +71,7 @@
{
throw ActionParseError{
ActionBase::getName(),
- fmt::format("Group name {} is not a valid group", name)};
+ std::format("Group name {} is not a valid group", name)};
}
return &(*groupIt);
@@ -195,7 +194,7 @@
{
throw ActionParseError{
ActionBase::getName(),
- fmt::format("condition_group {} must only have 1 member",
+ std::format("condition_group {} must only have 1 member",
_conditionGroup->getName())};
}
@@ -267,7 +266,7 @@
!std::is_same_v<int32_t, V> &&
!std::is_same_v<int64_t, V>)
{
- throw std::runtime_error{fmt::format(
+ throw std::runtime_error{std::format(
"{}: Group {} has more than one member but "
"isn't numeric",
ActionBase::getName(), group.getName())};
@@ -404,7 +403,7 @@
// If the parameter isn't there, then don't use
// this floor table
log<level::DEBUG>(
- fmt::format("{}: Parameter {} specified in the JSON "
+ std::format("{}: Parameter {} specified in the JSON "
"could not be found",
ActionBase::getName(),
std::get<std::string>(groupOrParameter))