From 16c741a1826b66ff5bb1f2b29311aa95cad08089 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 10 Aug 2012 14:59:20 -0700 Subject: [PATCH] action: don't merge twice in read_from() synchronize_with() already takes care of the clock vector merging, so don't merge a second time. --- action.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/action.cc b/action.cc index 131cb74..5c036ef 100644 --- a/action.cc +++ b/action.cc @@ -167,7 +167,6 @@ void ModelAction::read_from(const ModelAction *act) ASSERT(cv); if (act!=NULL && act->is_release() && this->is_acquire()) { synchronize_with(act); - cv->merge(act->cv); } reads_from = act; } -- 2.34.1