projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
bug in fence support fixed
[c11tester.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 9000a5d72eddd90ba1ba5964e4a12105a75ca9b1..e19a2113a5e10f9860669656bb1583ec91da3620 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-15,7
+15,7
@@
class ClockVector {
public:
ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
~ClockVector();
-
void
merge(const ClockVector *cv);
+
bool
merge(const ClockVector *cv);
bool synchronized_since(const ModelAction *act) const;
void print() const;