Commit 788d9505 authored by Stephen Morris's avatar Stephen Morris

[trac641] Changes after review comments

parent e0122c1e
......@@ -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 {
......
......@@ -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) {}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment