Mercurial > flash_v2

diff host/libcdl/transact.cxx @ 90:70190fa0fe10 ecos-sw-2000-05-19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from eCos master repository on 2000-05-19-07:47:03-BST
author jlarmour
date Fri, 19 May 2000 12:47:51 +0000
parents 435cced73e2f
children 5a0cc6c243a9
line wrap: on
line diff
--- a/host/libcdl/transact.cxx
+++ b/host/libcdl/transact.cxx
@@ -1389,7 +1389,8 @@ CdlTransactionBody::clear_structural_con
     CYG_ASSERT_CLASSC(toplevel);
     for (conf_i = toplevel->structural_conflicts.begin(); conf_i != toplevel->structural_conflicts.end(); ) {
         CdlConflict conflict = *conf_i++;
-        if ((node == conflict->get_node()) && (prop == conflict->get_property()) && (*pFn)(conflict)) {
+        if ((node == conflict->get_node()) && (prop == conflict->get_property()) &&
+            !(this->has_conflict_been_cleared(conflict)) && (*pFn)(conflict)) {
             this->clear_conflict(conflict);
         }
     }