projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c065a08
)
tabbing
author
Brian Demsky
<bdemsky@uci.edu>
Tue, 7 Apr 2020 22:37:17 +0000
(15:37 -0700)
committer
Brian Demsky
<bdemsky@uci.edu>
Tue, 7 Apr 2020 22:37:17 +0000
(15:37 -0700)
actionlist.cc
patch
|
blob
|
history
diff --git
a/actionlist.cc
b/actionlist.cc
index e39fb3cff2ac845d1dc3aa294a761b7180c70d3c..3ffaa38355c6f66c07730f6004b19bdc19e9617f 100644
(file)
--- a/
actionlist.cc
+++ b/
actionlist.cc
@@
-5,11
+5,11
@@
#include <limits.h>
actionlist::actionlist() :
#include <limits.h>
actionlist::actionlist() :
- head(NULL),
- tail(NULL),
- _size(0)
+
head(NULL),
+
tail(NULL),
+
_size(0)
{
{
- root.parent = NULL;
+
root.parent = NULL;
}
actionlist::~actionlist() {
}
actionlist::~actionlist() {
@@
-48,7
+48,7
@@
sllnode<ModelAction *> * allnode::findPrev(modelclock_t index) {
} else {
//found non-null...
if (totalshift == 0)
} else {
//found non-null...
if (totalshift == 0)
- return reinterpret_cast<sllnode<ModelAction *> *>(((uintptr_t)ptr->children[currindex])& ACTMASK);
+
return reinterpret_cast<sllnode<ModelAction *> *>(((uintptr_t)ptr->children[currindex])& ACTMASK);
//need to increment here...
ptr = ptr->children[currindex];
increment = increment >> ALLBITS;
//need to increment here...
ptr = ptr->children[currindex];
increment = increment >> ALLBITS;
@@
-111,9
+111,9
@@
void actionlist::addAction(ModelAction * act) {
//see if we are the new tail
if (llnode->next != NULL)
//see if we are the new tail
if (llnode->next != NULL)
- llnode->next->prev = llnode;
+
llnode->next->prev = llnode;
else
else
- tail = llnode;
+
tail = llnode;
llnodeprev->next = llnode;
} else {
//We are the begining
llnodeprev->next = llnode;
} else {
//We are the begining
@@
-139,9
+139,9
@@
void actionlist::addAction(ModelAction * act) {
llnode->next = llnodeprev->next;
llnode->prev = llnodeprev;
if (llnode->next != NULL)
llnode->next = llnodeprev->next;
llnode->prev = llnodeprev;
if (llnode->next != NULL)
- llnode->next->prev = llnode;
+
llnode->next->prev = llnode;
else
else
- tail = llnode;
+
tail = llnode;
llnodeprev->next = llnode;
ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t) llnode) | ISACT);
}
llnodeprev->next = llnode;
ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t) llnode) | ISACT);
}