X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=0945bcf751dcd7eca5de6159affea9db49c58e3f;hb=9508fe09d2eeaaf7fbe7193d9cb81b3bc66316b5;hp=14bb809dabddb051358e27776a0896ef978c62a5;hpb=6e5c0bb2359b9fba6160957ffa88974233ba18ac;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 14bb809..0945bcf 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -37,10 +37,10 @@ ClockVector::~ClockVector()
  * resulting vector length will be the maximum length of the two being merged.
  * @param cv is the ClockVector being merged into this vector.
  */
-void ClockVector::merge(const ClockVector *cv)
+bool ClockVector::merge(const ClockVector *cv)
 {
 	ASSERT(cv != NULL);
-
+	bool changed = false;
 	if (cv->num_threads > num_threads) {
 		clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
 		for (int i = num_threads; i < cv->num_threads; i++)
@@ -50,8 +50,12 @@ void ClockVector::merge(const ClockVector *cv)
 
 	/* Element-wise maximum */
 	for (int i = 0; i < cv->num_threads; i++)
-		if (cv->clock[i] > clock[i])
+		if (cv->clock[i] > clock[i]) {
 			clock[i] = cv->clock[i];
+			changed = true;
+		}
+	
+	return changed;
 }
 
 /**