BIND 10 trac826, updated. 109f8bc3a5da4140c0ff007ae913d6687e0c2472 [trac826] Two temporary fixes to get tests running without errors...

[BIND 10 source code commits]

The branch, trac826 has been updated
       via  109f8bc3a5da4140c0ff007ae913d6687e0c2472 (commit)
      from  3eccf695b5a799163a9e8c227c17219dc1091e51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 109f8bc3a5da4140c0ff007ae913d6687e0c2472
Author: Francis Dupont <fdupont at isc.org>
Date:   Mon May 2 17:55:36 2011 +0200

    [trac826] Two temporary fixes to get tests running without errors...

-----------------------------------------------------------------------

Summary of changes:
 src/lib/cc/data.cc                   |    2 ++
 src/lib/config/tests/fake_session.cc |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cc/data.cc b/src/lib/cc/data.cc
index 6f7d4a2..5ea618d 100644
--- a/src/lib/cc/data.cc
+++ b/src/lib/cc/data.cc
@@ -852,6 +852,8 @@ removeIdentical(ElementPtr a, ConstElementPtr b) {
         if (b->contains((*it).first)) {
             if (a->get((*it).first)->equals(*b->get((*it).first))) {
                 a->remove((*it).first);
+		// temporary fix
+		it = m.begin();
             }
         }
     }
diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc
index 44bca53..b397d36 100644
--- a/src/lib/config/tests/fake_session.cc
+++ b/src/lib/config/tests/fake_session.cc
@@ -57,11 +57,12 @@ listContains(ConstElementPtr list, ConstElementPtr el) {
 void
 listRemove(ElementPtr list, ConstElementPtr el) {
     int i = -1;
+    int j = 0;
     BOOST_FOREACH(ConstElementPtr s_el, list->listValue()) {
         if (*el == *s_el) {
-            i = 0;
+            i = j;
         }
-        i++;
+        j++;
     }
     if (i >= 0) {
         list->remove(i);