Add merge TODO

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac408@3531 e5f2f494-b856-4b98-b285-d166d9295462

src/lib/nsas/nameserver_address_store.cc

@@ -97,6 +97,7 @@ newZone(const std::string* zone, uint16_t class_code,
     }
     // 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());

src/lib/nsas/nameserver_entry.cc

@@ -67,6 +67,7 @@ NameserverEntry::NameserverEntry(const AbstractRRset* v4Set,
     // 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 @@ NameserverEntry::NameserverEntry(const AbstractRRset* v4Set,
     // 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()),

src/lib/nsas/tests/nameserver_entry_unittest.cc

@@ -144,6 +144,7 @@ static void CompareAddresses(NameserverEntry::AddressVector& av,
     // 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());