[svn] commit: r3531 - in /branches/trac408/src/lib/nsas: nameserver_address_store.cc nameserver_entry.cc tests/nameserver_entry_unittest.cc

[BIND 10 source code commits]

Author: vorner
Date: Tue Nov 16 08:51:21 2010
New Revision: 3531

Log:
Add merge TODO

Modified:
    branches/trac408/src/lib/nsas/nameserver_address_store.cc
    branches/trac408/src/lib/nsas/nameserver_entry.cc
    branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc

Modified: branches/trac408/src/lib/nsas/nameserver_address_store.cc
==============================================================================
--- branches/trac408/src/lib/nsas/nameserver_address_store.cc (original)
+++ branches/trac408/src/lib/nsas/nameserver_address_store.cc Tue Nov 16 08:51:21 2010
@@ -97,6 +97,7 @@
     }
     // Make sure the name servers exist
     RdataIteratorPtr ns(authority->getRdataIterator());
+    // TODO Remove the call to first on merge with #410
     for (ns->first(); !ns->isLast(); ns->next()) {
         Name ns_name(dynamic_cast<const rdata::generic::NS&>(
                     ns->getCurrent()).getNSName());

Modified: branches/trac408/src/lib/nsas/nameserver_entry.cc
==============================================================================
--- branches/trac408/src/lib/nsas/nameserver_entry.cc (original)
+++ branches/trac408/src/lib/nsas/nameserver_entry.cc Tue Nov 16 08:51:21 2010
@@ -67,6 +67,7 @@
     // XXX: Do we need to check that these are V4 addresses?
     if (v4Set) {
         RdataIteratorPtr i = v4Set->getRdataIterator();
+        // TODO Remove at merge with #410
         i->first();
         while (! i->isLast()) {
             address_.push_back(AddressEntry(IOAddress(i->getCurrent().toText()),
@@ -84,6 +85,7 @@
     // XXX: Do we need to check that these are V6 addresses?
     if (v6Set) {
         RdataIteratorPtr i = v6Set->getRdataIterator();
+        // TODO Remove at merge with #410
         i->first();
         while (! i->isLast()) {
             address_.push_back(AddressEntry(IOAddress(i->getCurrent().toText()),

Modified: branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/nameserver_entry_unittest.cc Tue Nov 16 08:51:21 2010
@@ -144,6 +144,7 @@
     // Do the same for the Basic RRset
     vector<string> rrstr;
     RdataIteratorPtr i = rrs.getRdataIterator();
+    // TODO Remove at merge with #410
     i->first();
     while (! i->isLast()) {
         rrstr.push_back(i->getCurrent().toText());