projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move pthread_map and mutex_map inside of execution.h
[c11tester.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 6a902c5215342bae0313d56b3e6cfa8267bd79cf..e19a2113a5e10f9860669656bb1583ec91da3620 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-15,9
+15,8
@@
class ClockVector {
public:
ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
~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;
bool synchronized_since(const ModelAction *act) const;
- bool has_synchronized_with(const ClockVector *cv) const;
void print() const;
modelclock_t getClock(thread_id_t thread);
void print() const;
modelclock_t getClock(thread_id_t thread);