BIND 10 trac1384, updated. 5e2238494ec665b558a6bf3b6a2c7351c1e022ba [1384] forgot to commit two files

[BIND 10 source code commits]

The branch, trac1384 has been updated
       via  5e2238494ec665b558a6bf3b6a2c7351c1e022ba (commit)
      from  755cd222be64019ea3b8db62e6d2643e6b6374c7 (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 5e2238494ec665b558a6bf3b6a2c7351c1e022ba
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Nov 11 18:46:14 2011 +0100

    [1384] forgot to commit two files

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

Summary of changes:
 src/lib/datasrc/memory_datasrc.cc |    5 -----
 src/lib/datasrc/memory_datasrc.h  |    2 +-
 2 files changed, 1 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index 4017d9f..a0dfe70 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -752,7 +752,6 @@ public:
         if (node_ != NULL && node_->getData() != DomainPtr()) {
             dom_iterator_ = node_->getData()->begin();
             if (separate_rrs_) {
-                std::cout << "[XX] SET RDATA ITERATOR A" << std::endl;
                 if (dom_iterator_->second != NULL) {
                     rdata_iterator_ = dom_iterator_->second->getRdataIterator();
                 }
@@ -827,10 +826,6 @@ public:
 
 ZoneIteratorPtr
 InMemoryClient::getIterator(const Name& name, bool separate_rrs) const {
-    // note: adjust_ttl argument is ignored, as the RRsets are already
-    // individually stored, and hence cannot have different TTLs anymore at
-    // this point
-
     ZoneTable::FindResult result(impl_->zone_table.findZone(name));
     if (result.code != result::SUCCESS) {
         isc_throw(DataSourceError, "No such zone: " + name.toText());
diff --git a/src/lib/datasrc/memory_datasrc.h b/src/lib/datasrc/memory_datasrc.h
index 1b6c120..b37be37 100644
--- a/src/lib/datasrc/memory_datasrc.h
+++ b/src/lib/datasrc/memory_datasrc.h
@@ -273,7 +273,7 @@ public:
 
     /// \brief Implementation of the getIterator method
     virtual ZoneIteratorPtr getIterator(const isc::dns::Name& name,
-                                        bool adjust_ttl = true) const;
+                                        bool separate_rrs = false) const;
 
     /// In-memory data source is read-only, so this derived method will
     /// result in a NotImplemented exception.