X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=1387ed15b67c9ac25d7fcba68491bbb72d8ff236;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=16f2327e8dc73de1ef564747bb27ae8c54c639fd;hpb=55eb20c50ec656d385fb6e94c01aea55e9514917;p=model-checker.git diff --git a/action.cc b/action.cc index 16f2327..1387ed1 100644 --- a/action.cc +++ b/action.cc @@ -365,7 +365,7 @@ bool ModelAction::synchronize_with(const ModelAction *act) { bool ModelAction::has_synchronized_with(const ModelAction *act) const { - return cv->has_synchronized_with(act->cv); + return cv->synchronized_since(act); } /** @@ -492,7 +492,7 @@ unsigned int ModelAction::hash() const unsigned int hash=(unsigned int) this->type; hash^=((unsigned int)this->order)<<3; hash^=seq_number<<5; - hash^=tid<<6; + hash ^= id_to_int(tid) << 6; if (is_read()) { if (reads_from)