BIND 10 trac641, updated. 788d9505e0bec5369ccecc6f51af957874063fd8 [trac641] Changes after review comments

[BIND 10 source code commits]

The branch, trac641 has been updated
       via  788d9505e0bec5369ccecc6f51af957874063fd8 (commit)
      from  e0122c1e3219488a152350666165369a0e9fbe32 (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 788d9505e0bec5369ccecc6f51af957874063fd8
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Mar 16 10:55:18 2011 +0000

    [trac641] Changes after review comments

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

Summary of changes:
 src/lib/nsas/nameserver_address_store.cc |   11 ++++++-----
 src/lib/nsas/random_number_generator.h   |   12 ++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/nsas/nameserver_address_store.cc b/src/lib/nsas/nameserver_address_store.cc
index 9a8149d..01e8499 100644
--- a/src/lib/nsas/nameserver_address_store.cc
+++ b/src/lib/nsas/nameserver_address_store.cc
@@ -66,12 +66,12 @@ namespace {
  */
 boost::shared_ptr<ZoneEntry>
 newZone(
-    isc::resolve::ResolverInterface** const resolver,
+    isc::resolve::ResolverInterface* resolver,
     const string* zone, const RRClass* class_code,
     const boost::shared_ptr<HashTable<NameserverEntry> >* ns_hash,
     const boost::shared_ptr<LruList<NameserverEntry> >* ns_lru)
 {
-    boost::shared_ptr<ZoneEntry> result(new ZoneEntry(*resolver, *zone, *class_code,
+    boost::shared_ptr<ZoneEntry> result(new ZoneEntry(resolver, *zone, *class_code,
         *ns_hash, *ns_lru));
     return (result);
 }
@@ -82,9 +82,10 @@ void
 NameserverAddressStore::lookup(const string& zone, const RRClass& class_code,
     boost::shared_ptr<AddressRequestCallback> callback, AddressFamily family)
 {
-    pair<bool, boost::shared_ptr<ZoneEntry> > zone_obj(zone_hash_->getOrAdd(HashKey(
-        zone, class_code), boost::bind(newZone, &resolver_, &zone, &class_code,
-        &nameserver_hash_, &nameserver_lru_)));
+    pair<bool, boost::shared_ptr<ZoneEntry> > zone_obj(
+        zone_hash_->getOrAdd(HashKey(zone, class_code),
+                             boost::bind(newZone, resolver_, &zone, &class_code,
+                                         &nameserver_hash_, &nameserver_lru_)));
     if (zone_obj.first) {
         zone_lru_->add(zone_obj.second);
     } else {
diff --git a/src/lib/nsas/random_number_generator.h b/src/lib/nsas/random_number_generator.h
index 85c6b89..8884d0e 100644
--- a/src/lib/nsas/random_number_generator.h
+++ b/src/lib/nsas/random_number_generator.h
@@ -29,22 +29,22 @@
 namespace isc {
 namespace nsas {
 
-class InvalidLimits : public Exception {
+class InvalidLimits : public isc::BadValue {
 public:
     InvalidLimits(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) {}
+        isc::BadValue(file, line, what) {}
 };
 
-class SumNotOne : public Exception {
+class SumNotOne : public isc::BadValue {
 public:
     SumNotOne(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) {}
+        isc::BadValue(file, line, what) {}
 };
 
-class InvalidProbValue : public Exception {
+class InvalidProbValue : public isc::BadValue {
 public:
     InvalidProbValue(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) {}
+        isc::BadValue(file, line, what) {}
 };