mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-17 07:28:38 +00:00
4cd1d26236Closes: https://bugs.gentoo.org/963035 Signed-off-by: Alfred Wingate <parona@protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44649 Closes: https://github.com/gentoo/gentoo/pull/44649 Signed-off-by: Sam James <sam@gentoo.org>
55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
https://bugs.gentoo.org/963035
|
|
https://gitlab.kitware.com/third-party/seacas/-/commit/324c9e0ad360da1dc819b0134e1bda3956048b43
|
|
|
|
Changed paths and removed irrevelant changes for upstream vtk.
|
|
|
|
These changed were merged into vtk itself in:
|
|
https://gitlab.kitware.com/vtk/vtk/-/commit/505fe4b14477e00d7285ea771200a2cba099f26a
|
|
|
|
From 324c9e0ad360da1dc819b0134e1bda3956048b43 Mon Sep 17 00:00:00 2001
|
|
From: Greg Sjaardema <gsjaardema@gmail.com>
|
|
Date: Fri, 11 Jul 2025 09:34:37 -0600
|
|
Subject: [PATCH] IOSS: Update fmt library; use std::localtime instead of
|
|
fmt::localtime
|
|
|
|
--- a/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
|
+++ b/ThirdParty/ioss/vtkioss/Ioss_Utils.C
|
|
@@ -1,4 +1,4 @@
|
|
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
|
|
+// Copyright(C) 1999-2025 National Technology & Engineering Solutions
|
|
// of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with
|
|
// NTESS, the U.S. Government retains certain rights in this software.
|
|
//
|
|
@@ -161,13 +161,13 @@ std::ostream &Ioss::Utils::get_debug_stream() { return *m_debugStream; }
|
|
void Ioss::Utils::time_and_date(char *time_string, char *date_string, size_t length)
|
|
{
|
|
std::time_t t = std::time(nullptr);
|
|
- std::string time = fmt::format("{:%H:%M:%S}", fmt::localtime(t));
|
|
+ std::string time = fmt::format("{:%H:%M:%S}", *std::localtime(&t));
|
|
std::string date;
|
|
if (length >= 10) {
|
|
- date = fmt::format("{:%Y/%m/%d}", fmt::localtime(t));
|
|
+ date = fmt::format("{:%Y/%m/%d}", *std::localtime(&t));
|
|
}
|
|
else {
|
|
- date = fmt::format("{:%y/%m/%d}", fmt::localtime(t));
|
|
+ date = fmt::format("{:%y/%m/%d}", *std::localtime(&t));
|
|
}
|
|
copy_string(time_string, time, 9);
|
|
copy_string(date_string, date, length + 1);
|
|
--- a/ThirdParty/ioss/vtkioss/cgns/Iocgns_Utils.C
|
|
+++ b/ThirdParty/ioss/vtkioss/cgns/Iocgns_Utils.C
|
|
@@ -1051,8 +1051,8 @@ size_t Iocgns::Utils::common_write_metadata(int file_ptr, const Ioss::Region &re
|
|
|
|
CGERR(cg_goto(file_ptr, base, "end"));
|
|
std::time_t t = std::time(nullptr);
|
|
- std::string date = fmt::format("{:%Y/%m/%d}", fmt::localtime(t));
|
|
- std::string time = fmt::format("{:%H:%M:%S}", fmt::localtime(t));
|
|
+ std::string date = fmt::format("{:%Y/%m/%d}", *std::localtime(&t));
|
|
+ std::string time = fmt::format("{:%H:%M:%S}", *std::localtime(&t));
|
|
|
|
std::string code_version = region.get_optional_property("code_version", "unknown");
|
|
std::string code_name = region.get_optional_property("code_name", "unknown");
|
|
--
|
|
GitLab
|
|
|