X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.h;h=1a36a39dc040838f2c37b8166a8faf9b9a6a80fd;hp=962e9ec4844995c811638030d5a7c11a983ea36e;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=15162a2ac08b0a6b06e5319a7424055f4d12e01c diff --git a/clockvector.h b/clockvector.h index 962e9ec4..1a36a39d 100644 --- 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;