From: Tomek Mrugalski Date: Tue, 16 Apr 2019 17:29:20 +0000 (+0200) Subject: [#465,!265] Compilation fixes after rebase. X-Git-Tag: Kea-1.6.0-beta~202 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c68ed1289e424d03c475f81dad6c8682c22fa1e;p=thirdparty%2Fkea.git [#465,!265] Compilation fixes after rebase. --- diff --git a/src/lib/dhcpsrv/shared_network.cc b/src/lib/dhcpsrv/shared_network.cc index 0e2b8e0961..d691e73af4 100644 --- a/src/lib/dhcpsrv/shared_network.cc +++ b/src/lib/dhcpsrv/shared_network.cc @@ -316,10 +316,10 @@ SharedNetwork4::replace(const Subnet4Ptr& subnet) { bool ret = Impl::replace(subnets_, subnet); if (ret) { // Associate the subnet with this network. - setSharedNetwork(subnet); + subnet->setSharedNetwork(shared_from_this()); subnet->setSharedNetworkName(name_); // Deassociate the previous subnet. - clearSharedNetwork(old); + old->setSharedNetwork(NetworkPtr()); old->setSharedNetworkName(""); } return (ret); @@ -401,10 +401,10 @@ SharedNetwork6::replace(const Subnet6Ptr& subnet) { bool ret = Impl::replace(subnets_, subnet); if (ret) { // Associate the subnet with this network. - setSharedNetwork(subnet); + subnet->setSharedNetwork(shared_from_this()); subnet->setSharedNetworkName(name_); // Deassociate the previous subnet. - clearSharedNetwork(old); + old->setSharedNetwork(NetworkPtr()); old->setSharedNetworkName(""); } return (ret);