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 #include #include - +#include +#include #include - #include namespace villas { @@ -185,3 +185,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/vlnv.hpp b/fpga/include/villas/fpga/vlnv.hpp index 65b812cd6..7b7be2b49 100644 --- a/fpga/include/villas/fpga/vlnv.hpp +++ b/fpga/include/villas/fpga/vlnv.hpp @@ -10,6 +10,8 @@ #include #include #include +#include +#include namespace villas { namespace fpga { @@ -70,3 +72,9 @@ private: } // namespace fpga } // namespace villas + +#ifndef FMT_LEGACY_OSTREAM_FORMATTER +template <> +class fmt::formatter + : public fmt::ostream_formatter {}; +#endif diff --git a/fpga/lib/pcie_card.cpp b/fpga/lib/pcie_card.cpp index 46fb7ac74..f68da1533 100644 --- a/fpga/lib/pcie_card.cpp +++ b/fpga/lib/pcie_card.cpp @@ -8,13 +8,11 @@ #include #include #include - +#include #include #include - #include #include - #include #include #include @@ -96,7 +94,7 @@ std::list> PCIeCardFactory::make(json_t *json, } if (!searchPath.empty()) { std::filesystem::path json_ips_path = searchPath / json_string_value(json_ips); - logger->debug("searching for FPGA IP cors config at {}", json_ips_path); + logger->debug("searching for FPGA IP cors config at {}", json_ips_path.string()); json_ips = json_load_file(json_ips_path.c_str(), 0, nullptr); } if (json_ips == nullptr) {