From 82cab25f1bf2b28d2522a84b4bf69b0ffe3f5eaf Mon Sep 17 00:00:00 2001 From: Manuel Pitz Date: Wed, 7 Oct 2020 15:52:43 +0200 Subject: [PATCH] finish rebase master --- lib/hooks/dft.cpp | 2 +- lib/nodes/uldaq.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/hooks/dft.cpp b/lib/hooks/dft.cpp index a9ff85f1a..aedcf1aba 100644 --- a/lib/hooks/dft.cpp +++ b/lib/hooks/dft.cpp @@ -90,7 +90,7 @@ protected: public: - DftHook(struct vpath *p, struct node *n, int fl, int prio, bool en = true) : + DftHook(struct vpath *p, struct vnode *n, int fl, int prio, bool en = true) : Hook(p, n, fl, prio, en), window_type(windowType::NONE), padding_type(paddingType::ZERO), diff --git a/lib/nodes/uldaq.cpp b/lib/nodes/uldaq.cpp index 37b5cfbd7..8e6ce46f8 100644 --- a/lib/nodes/uldaq.cpp +++ b/lib/nodes/uldaq.cpp @@ -486,7 +486,7 @@ void ul_decode_error(UlError err){ warning("Found error: %s",errorList[i].errStr); } } -char * uldaq_print(struct node *n) +char * uldaq_print(struct vnode *n) { struct uldaq *u = (struct uldaq *) n->_vd;