From 80470e638859457c6bd2513dbc85a725b2bef78d Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 31 Jul 2024 07:38:40 -0600 Subject: [PATCH] IOSS: Fix some misues of lib::fmt causing issues with C++20 --- packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C | 7 ++----- packages/seacas/libraries/ioss/src/Ioss_Utils.C | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C index 870140a1d2..f16b426753 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C @@ -379,10 +379,7 @@ namespace Ioss { DatabaseIO::~DatabaseIO() = default; - Ioss::DataSize DatabaseIO::int_byte_size_data_size() const - { - return dbIntSizeAPI; - } + Ioss::DataSize DatabaseIO::int_byte_size_data_size() const { return dbIntSizeAPI; } int DatabaseIO::int_byte_size_api() const { @@ -1638,7 +1635,7 @@ namespace { else { char sep = (util.parallel_size() > 1) ? ':' : ' '; for (auto &p_time : all_times) { - fmt::print(strm, "{:8d}{}", p_time, sep); + fmt::print(strm, "{:8}{}", p_time, sep); } } if (util.parallel_size() > 1) { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index 4ea1f2f3b9..a61e1d5bd3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -1377,7 +1377,7 @@ void Ioss::Utils::info_fields(const Ioss::GroupingEntity *ige, Ioss::Field::Role fmt::print("{1:>{0}s}:{2} ", max_width, field_name, comp_count); cur_out += max_width + 4; if (cur_out + max_width >= width) { - fmt::print(suffix); + fmt::print("{}", suffix); cur_out = 8; } }