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

make compatible to fmt version 9.0.3

Browse source 
Signed-off-by: Manuel Pitz <manuel.pitz@eonerc.rwth-aachen.de>
This commit is contained in:
Manuel Pitz 2023-01-10 15:15:20 +01:00 • committed by Steffen Vogel
parent a91158eb6c
commit 4bfe40f302
5 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/include/villas/graph/directed.hpp
View file

@ -86,7 +86,7 @@ public:
{
vertex->id = lastVertexId++;
logger->debug("New vertex: {}", *vertex);
logger->debug("New vertex: {}", vertex->toString());
vertices[vertex->id] = vertex;
return vertex->id;
@ -103,7 +103,7 @@ public:
edge->from = fromVertexId;
edge->to = toVertexId;
logger->debug("New edge {}: {} -> {}", *edge, edge->from, edge->to);
logger->debug("New edge {}: {} -> {}", edge->toString(), edge->from, edge->to);
// This is a directed graph, so only push edge to starting vertex
getVertex(edge->from)->edges.push_back(edge->id);
@ -242,7 +242,7 @@ public:
ssEdges << getEdge(edge)->to << " ";
}
logger->info(" {} connected to: {}", *vertex, ssEdges.str());
logger->info(" {} connected to: {}", vertex->toString(), ssEdges.str());
}
std::fstream s(fileName, s.out | s.trunc);
@ -254,7 +254,7 @@ public:
for (auto &e : edges) {
auto &edge = e.second;
logger->info(" {}: {} -> {}", *edge, edge->from, edge->to);
logger->info(" {}: {} -> {}", edge->toString(), edge->from, edge->to);
if (s.is_open()) {
auto from = getVertex(edge->from);
auto to = getVertex(edge->to);

6
common/include/villas/graph/edge.hpp
View file

@ -39,6 +39,12 @@ public:
return from;
}
std::string toString() {
std::stringstream ss;
ss << *this;
return ss.str();
}
private:
Identifier id;
Vertex::Identifier from;

6
common/include/villas/graph/vertex.hpp
View file

@ -38,6 +38,12 @@ public:
return this->id == other.id;
}
std::string toString() {
std::stringstream ss;
ss << *this;
return ss.str();
}
private:
Identifier id;
// HACK: how to resolve this circular type dependency?

3
common/include/villas/plugin.hpp
View file

@ -167,6 +167,7 @@ public:
{
return os << p.getName();
}
};
template<typename T>
@ -178,7 +179,7 @@ Registry::dump()
for (Plugin *p : plugins) {
T *t = dynamic_cast<T *>(p);
if (t)
getLogger()->info(" - {}: {}", *p, p->getDescription());
getLogger()->info(" - {}: {}", p->getName(), p->getDescription());
}
}

4
common/lib/memory_manager.cpp
View file

@ -98,7 +98,7 @@ MemoryManager::findPath(const MemoryManager::AddressSpaceId &fromAddrSpaceId,
if (not memoryGraph.getPath(fromAddrSpaceId, toAddrSpaceId, pathGraph, pathCheckFunc)) {
logger->debug("No translation found from ({}) to ({})",
*fromAddrSpace, *toAddrSpace);
fromAddrSpace->toString(), toAddrSpace->toString());
throw std::out_of_range("no translation found");
}
@ -122,7 +122,7 @@ MemoryManager::getTranslation(const MemoryManager::AddressSpaceId &fromAddrSpace
auto fromAddrSpace = memoryGraph.getVertex(fromAddrSpaceId);
auto toAddrSpace = memoryGraph.getVertex(toAddrSpaceId);
logger->debug("No translation found from ({}) to ({})",
*fromAddrSpace, *toAddrSpace);
fromAddrSpace->toString(), toAddrSpace->toString());
throw std::out_of_range("no translation found");
}