From e2c2ec2c8b3773a3122e862780b404993a7e6c56 Mon Sep 17 00:00:00 2001
From: Philipp Jungkamp
Date: Mon, 25 Sep 2023 12:28:44 +0200
Subject: [PATCH] Fix fmt 10.0.0 related formatting errors.
Signed-off-by: Philipp Jungkamp
---
fpga/common | 2 +-
fpga/include/villas/fpga/core.hpp | 15 ++++++++++++---
fpga/include/villas/fpga/ips/dma.hpp | 9 ++++++++-
fpga/include/villas/fpga/node.hpp | 13 +++++++++++--
fpga/include/villas/fpga/vlnv.hpp | 8 ++++++++
fpga/lib/pcie_card.cpp | 6 ++----
6 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/fpga/common b/fpga/common
index 90e0c3df7..b33fe9679 160000
--- a/fpga/common
+++ b/fpga/common
@@ -1 +1 @@
-Subproject commit 90e0c3df70200f0eccbb3b145393f81e31e15ebb
+Subproject commit b33fe9679c1e1b6c79cd115bfd6b9bb224575068
diff --git a/fpga/include/villas/fpga/core.hpp b/fpga/include/villas/fpga/core.hpp
index 7efb1e789..6376baf64 100644
--- a/fpga/include/villas/fpga/core.hpp
+++ b/fpga/include/villas/fpga/core.hpp
@@ -14,12 +14,12 @@
#include
#include
#include
-
+#include
#include
#include
+#include
#include
#include
-
#include
namespace villas {
@@ -280,7 +280,7 @@ protected:
IRQ,
};
- Logger getLogger() const
+ Logger getLogger()
{
return villas::logging.get(getName());
}
@@ -345,3 +345,12 @@ private:
} // namespace ip
} // namespace fpga
} // namespace villas
+
+#ifndef FMT_LEGACY_OSTREAM_FORMATTER
+template <>
+class fmt::formatter
+ : public fmt::ostream_formatter {};
+template <>
+class fmt::formatter
+ : public fmt::ostream_formatter {};
+#endif
diff --git a/fpga/include/villas/fpga/ips/dma.hpp b/fpga/include/villas/fpga/ips/dma.hpp
index 333a9a372..8621b8f85 100644
--- a/fpga/include/villas/fpga/ips/dma.hpp
+++ b/fpga/include/villas/fpga/ips/dma.hpp
@@ -9,8 +9,9 @@
#pragma once
+#include
#include
-
+#include
#include
#include
#include
@@ -186,3 +187,9 @@ protected:
} // namespace ip
} // namespace fpga
} // namespace villas
+
+#ifndef FMT_LEGACY_OSTREAM_FORMATTER
+template <>
+class fmt::formatter
+ : public fmt::ostream_formatter {};
+#endif
diff --git a/fpga/include/villas/fpga/node.hpp b/fpga/include/villas/fpga/node.hpp
index 5b53cb24a..bd4632882 100644
--- a/fpga/include/villas/fpga/node.hpp
+++ b/fpga/include/villas/fpga/node.hpp
@@ -13,9 +13,9 @@
#include