projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update readme
[c11tester.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 962e9ec4844995c811638030d5a7c11a983ea36e..1a36a39dc040838f2c37b8166a8faf9b9a6a80fd 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-14,6
+14,7
@@
public:
ClockVector(ClockVector *parent = NULL, const ModelAction *act = NULL);
~ClockVector();
bool merge(const ClockVector *cv);
+ bool minmerge(const ClockVector *cv);
bool synchronized_since(const ModelAction *act) const;
void print() const;