mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
finish rebase master
This commit is contained in:
parent
92482f4fda
commit
bb16b07a69
2 changed files with 2 additions and 2 deletions
|
@ -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),
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue