Mercurial > flash_v2
diff host/libcdl/transact.cxx @ 171:42f843b391aa
Merge from eCos master repository on 2001-07-18-03:13:25-BST
| author | jlarmour |
|---|---|
| date | Wed, 18 Jul 2001 11:38:39 +0000 |
| parents | 5a0cc6c243a9 |
| children | e0c0827131d1 |
line wrap: on
line diff
--- a/host/libcdl/transact.cxx +++ b/host/libcdl/transact.cxx @@ -10,7 +10,7 @@ //####COPYRIGHTBEGIN#### // // ---------------------------------------------------------------------------- -// Copyright (C) 1999, 2000 Red Hat, Inc. +// Copyright (C) 1999, 2000, 2001 Red Hat, Inc. // // This file is part of the eCos host tools. // @@ -2373,7 +2373,10 @@ CdlTransactionBody::is_preferable_to(Cdl CYG_PRECONDITIONC(this != other); bool result = false; - if (this->changes.size() < other->changes.size()) { + unsigned int this_changes = this->changes.size() + this->activated.size() + this->deactivated.size(); + unsigned int other_changes = other->changes.size() + other->activated.size() + other->deactivated.size(); + + if (this_changes <= other_changes) { result = true; }
