Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Fix fmt 10.0.0 related formatting errors.

Browse source 
Signed-off-by: Philipp Jungkamp <p.jungkamp@gmx.net>
This commit is contained in:
Philipp Jungkamp 2023-09-25 12:28:44 +02:00 • committed by Steffen Vogel
parent 157d5b21d7
commit e2c2ec2c8b
6 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fpga/common

@ -1 +1 @@
Subproject commit 90e0c3df70200f0eccbb3b145393f81e31e15ebb
Subproject commit b33fe9679c1e1b6c79cd115bfd6b9bb224575068

15
fpga/include/villas/fpga/core.hpp
View file

@ -14,12 +14,12 @@
#include <list>
#include <memory>
#include <jansson.h>
#include <fmt/ostream.h>
#include <villas/log.hpp>
#include <villas/colors.hpp>
#include <villas/config.hpp>
#include <villas/memory.hpp>
#include <villas/plugin.hpp>
#include <villas/fpga/vlnv.hpp>
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<villas::fpga::ip::IpIdentifier>
: public fmt::ostream_formatter {};
template <>
class fmt::formatter<villas::fpga::ip::Core>
: public fmt::ostream_formatter {};
#endif

9
fpga/include/villas/fpga/ips/dma.hpp
View file

@ -9,8 +9,9 @@
#pragma once
#include <fmt/ostream.h>
#include <xilinx/xaxidma.h>
#include <villas/config.hpp>
#include <villas/memory.hpp>
#include <villas/fpga/node.hpp>
#include <villas/exceptions.hpp>
@ -186,3 +187,9 @@ protected:
} // namespace ip
} // namespace fpga
} // namespace villas
#ifndef FMT_LEGACY_OSTREAM_FORMATTER
template <>
class fmt::formatter<villas::fpga::ip::Dma>
: public fmt::ostream_formatter {};
#endif

13
fpga/include/villas/fpga/node.hpp
View file

@ -13,9 +13,9 @@
#include <map>
#include <string>
#include <jansson.h>
#include <fmt/ostream.h>
#include <villas/config.hpp>
#include <villas/fpga/core.hpp>
#include <villas/graph/directed.hpp>
namespace villas {
@ -185,3 +185,12 @@ private:
} // namespace ip
} // namespace fpga
} // namespace villas
#ifndef FMT_LEGACY_OSTREAM_FORMATTER
template <>
class fmt::formatter<villas::fpga::ip::StreamVertex>
: public fmt::ostream_formatter {};
template <>
class fmt::formatter<villas::fpga::ip::Node>
: public fmt::ostream_formatter {};
#endif

8
fpga/include/villas/fpga/vlnv.hpp
View file

@ -10,6 +10,8 @@
#include <string>
#include <sstream>
#include <iostream>
#include <fmt/ostream.h>
#include <villas/config.hpp>
namespace villas {
namespace fpga {
@ -70,3 +72,9 @@ private:
} // namespace fpga
} // namespace villas
#ifndef FMT_LEGACY_OSTREAM_FORMATTER
template <>
class fmt::formatter<villas::fpga::Vlnv>
: public fmt::ostream_formatter {};
#endif

6
fpga/lib/pcie_card.cpp
View file

@ -8,13 +8,11 @@
#include <string>
#include <memory>
#include <utility>
#include <fmt/ostream.h>
#include <villas/exceptions.hpp>
#include <villas/memory.hpp>
#include <villas/kernel/pci.hpp>
#include <villas/kernel/vfio_container.hpp>
#include <villas/fpga/core.hpp>
#include <villas/fpga/node.hpp>
#include <villas/fpga/pcie_card.hpp>
@ -96,7 +94,7 @@ std::list<std::shared_ptr<PCIeCard>> 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) {