[5315_rebase] Changes after rebase and review:

 - Renamed SubnetIdIndexTag to avoid collision
 - Moved OptionDataParser to option_data_parser.cc|h
 - Updated hooks.xml to reflect recent changes

1 files changed, 1 insertions, 13 deletions

diff --git a/src/lib/dhcpsrv/cfg_subnets6.cc b/src/lib/dhcpsrv/cfg_subnets6.cc
index f4278a1878..e35b3773d4 100644
--- a/src/lib/dhcpsrv/cfg_subnets6.cc
+++ b/src/lib/dhcpsrv/cfg_subnets6.cc
@@ -40,7 +40,7 @@ CfgSubnets6::add(const Subnet6Ptr& subnet) {
 
 void
 CfgSubnets6::del(const ConstSubnet6Ptr& subnet) {
-    auto& index = subnets_.get<SubnetIdIndexTag>();
+    auto& index = subnets_.get<SubnetSubnetIdIndexTag>();
     auto subnet_it = index.find(subnet->getID());
     if (subnet_it == index.end()) {
         isc_throw(BadValue, "no subnet with ID of '" << subnet->getID()
@@ -212,18 +212,6 @@ CfgSubnets6::getSubnet(const SubnetID id) const {
     return (Subnet6Ptr());
 }
 
-
-bool
-CfgSubnets6::isDuplicate(const Subnet6& subnet) const {
-    for (Subnet6Collection::const_iterator subnet_it = subnets_.begin();
-         subnet_it != subnets_.end(); ++subnet_it) {
-        if ((*subnet_it)->getID() == subnet.getID()) {
-            return (true);
-        }
-    }
-    return (false);
-}
-
 void
 CfgSubnets6::removeStatistics() {
     using namespace isc::stats;