From 48b98c195c836477b8a281f8e1ec3374ac8cd487 Mon Sep 17 00:00:00 2001 From: Manuel Pitz Date: Tue, 10 Jan 2023 16:41:58 +0100 Subject: [PATCH] make compatible to fmt version 9.0.3 review fixes Signed-off-by: Manuel Pitz --- lib/path.cpp | 2 +- lib/super_node.cpp | 6 +++--- src/villas-pipe.cpp | 2 +- src/villas-signal.cpp | 2 +- src/villas-test-rtt.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/path.cpp b/lib/path.cpp index ad8e4e7f7..96172fb90 100644 --- a/lib/path.cpp +++ b/lib/path.cpp @@ -290,7 +290,7 @@ void Path::prepare(NodeList &nodes) ret = pd->prepare(queuelen); if (ret) - throw RuntimeError("Failed to prepare path destination {} of path {}", (pd->node)->getName(), this->toString()); + throw RuntimeError("Failed to prepare path destination {} of path {}", pd->node->getName(), this->toString()); } /* Autodetect whether to use original sequence numbers or not */ diff --git a/lib/super_node.cpp b/lib/super_node.cpp index 72a710af5..ec70b8287 100644 --- a/lib/super_node.cpp +++ b/lib/super_node.cpp @@ -235,7 +235,7 @@ void SuperNode::prepareNodeTypes() ret = nf->start(this); if (ret) - throw RuntimeError("Failed to start node-type: {}", (n->getFactory())->getName()); + throw RuntimeError("Failed to start node-type: {}", n->getFactory()->getName()); } } @@ -383,7 +383,7 @@ void SuperNode::stopNodeTypes() ret = nf->stop(); if (ret) - throw RuntimeError("Failed to stop node-type: {}", (n->getFactory())->getName()); + throw RuntimeError("Failed to stop node-type: {}", n->getFactory()->getName()); } } @@ -508,7 +508,7 @@ graph_t * SuperNode::getGraph() uuid_unparse(n->getUuid(), uuid_str); set_attr(nodeMap[n], "shape", "ellipse"); - set_attr(nodeMap[n], "tooltip", fmt::format("type={}, uuid={}", (n->getFactory())->getName(), uuid_str)); + set_attr(nodeMap[n], "tooltip", fmt::format("type={}, uuid={}", n->getFactory()->getName(), uuid_str)); // set_attr(nodeMap[n], "fixedsize", "true"); // set_attr(nodeMap[n], "width", "0.15"); // set_attr(nodeMap[n], "height", "0.15"); diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp index 44b1beb72..33854324b 100644 --- a/src/villas-pipe.cpp +++ b/src/villas-pipe.cpp @@ -452,7 +452,7 @@ check: if (optarg == endptr) ret = node->getFactory()->start(&sn); if (ret) - throw RuntimeError("Failed to intialize node type {}: reason={}", (node->getFactory())->getName(), ret); + throw RuntimeError("Failed to intialize node type {}: reason={}", node->getFactory()->getName(), ret); sn.startInterfaces(); diff --git a/src/villas-signal.cpp b/src/villas-signal.cpp index 5492facd4..aa724c8e9 100644 --- a/src/villas-signal.cpp +++ b/src/villas-signal.cpp @@ -304,7 +304,7 @@ out: sample_decref(t); ret = node->getFactory()->stop(); if (ret) - throw RuntimeError("Failed to de-intialize node type {}: reason={}", (node->getFactory())->getName(), ret); + throw RuntimeError("Failed to de-intialize node type {}: reason={}", node->getFactory()->getName(), ret); delete node; delete formatter; diff --git a/src/villas-test-rtt.cpp b/src/villas-test-rtt.cpp index 8c945fadb..3b84c718e 100644 --- a/src/villas-test-rtt.cpp +++ b/src/villas-test-rtt.cpp @@ -175,7 +175,7 @@ check: if (optarg == endptr) ret = node->getFactory()->start(&sn); if (ret) - throw RuntimeError("Failed to start node-type {}: reason={}", (node->getFactory())->getName(), ret); + throw RuntimeError("Failed to start node-type {}: reason={}", node->getFactory()->getName(), ret); ret = node->prepare(); if (ret) @@ -229,7 +229,7 @@ check: if (optarg == endptr) ret = node->getFactory()->stop(); if (ret) - throw RuntimeError("Failed to stop node-type {}: reason={}", (node->getFactory())->getName(), ret); + throw RuntimeError("Failed to stop node-type {}: reason={}", node->getFactory()->getName(), ret); delete smp_send; delete smp_recv;