projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve git conflict
[c11tester.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 0e5ba8656c605b5de48108eebf5fd17cee35a7f0..962e9ec4844995c811638030d5a7c11a983ea36e 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-11,7
+11,7
@@
class ClockVector {
public:
class ClockVector {
public:
- ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
+ ClockVector(ClockVector *parent = NULL,
const
ModelAction *act = NULL);
~ClockVector();
bool merge(const ClockVector *cv);
bool synchronized_since(const ModelAction *act) const;
~ClockVector();
bool merge(const ClockVector *cv);
bool synchronized_since(const ModelAction *act) const;
@@
-28,4
+28,4
@@
private:
int num_threads;
};
int num_threads;
};
-#endif /* __CLOCKVECTOR_H__ */
+#endif /* __CLOCKVECTOR_H__ */