From 72036caf71d8d3ed257c1c8fef750b3821ea5bef Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 4 Aug 2022 21:59:37 -0400 Subject: [PATCH] use make_format_args() instead of make_args_checked() (removed in v9) --- src/error.h | 24 ++++++++++++------------ src/utils.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/error.h b/src/error.h index 65c4b6e841..61d4e5a243 100644 --- a/src/error.h +++ b/src/error.h @@ -31,31 +31,31 @@ class Error : protected Pointers { void universe_warn(const std::string &, int, const std::string &); [[noreturn]] void all(const std::string &, int, const std::string &); - template - void all(const std::string &file, int line, const S &format, Args &&...args) + template + void all(const std::string &file, int line, const std::string &format, Args &&...args) { - _all(file, line, format, fmt::make_args_checked(format, args...)); + _all(file, line, format, fmt::make_format_args(args...)); } [[noreturn]] void one(const std::string &, int, const std::string &); - template - void one(const std::string &file, int line, const S &format, Args &&...args) + template + void one(const std::string &file, int line, const std::string &format, Args &&...args) { - _one(file, line, format, fmt::make_args_checked(format, args...)); + _one(file, line, format, fmt::make_format_args(args...)); } void warning(const std::string &, int, const std::string &); - template - void warning(const std::string &file, int line, const S &format, Args &&...args) + template + void warning(const std::string &file, int line, const std::string &format, Args &&...args) { - _warning(file, line, format, fmt::make_args_checked(format, args...)); + _warning(file, line, format, fmt::make_format_args(args...)); } void message(const std::string &, int, const std::string &); - template - void message(const std::string &file, int line, const S &format, Args &&...args) + template + void message(const std::string &file, int line, const std::string &format, Args &&...args) { - _message(file, line, format, fmt::make_args_checked(format, args...)); + _message(file, line, format, fmt::make_format_args(args...)); } [[noreturn]] void done(int = 0); // 1 would be fully backwards compatible diff --git a/src/utils.h b/src/utils.h index a88244b694..279491e501 100644 --- a/src/utils.h +++ b/src/utils.h @@ -73,9 +73,9 @@ namespace utils { * \param format format string of message to be printed * \param args arguments to format string */ - template void logmesg(LAMMPS *lmp, const S &format, Args &&...args) + template void logmesg(LAMMPS *lmp, const std::string &format, Args &&...args) { - fmtargs_logmesg(lmp, format, fmt::make_args_checked(format, args...)); + fmtargs_logmesg(lmp, format, fmt::make_format_args(args...)); } /*! \overload