From: Razvan Becheriu Date: Tue, 21 Jan 2020 08:37:08 +0000 (+0200) Subject: [#1073] fixed rebase X-Git-Tag: Kea-1.7.4~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=349f37dc1515cef07a8a3ae495cf9dc12345dadf;p=thirdparty%2Fkea.git [#1073] fixed rebase --- diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc index 821ff1fd82..4b2f5cc127 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.cc +++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc @@ -1917,7 +1917,7 @@ MySqlLeaseMgr::addLease(const Lease6Ptr& lease) { template void -MySqlLeaseMgr::getLeaseCollection(MySqlLeaseContextPtr ctx, +MySqlLeaseMgr::getLeaseCollection(MySqlLeaseContextPtr& ctx, StatementIndex stindex, MYSQL_BIND* bind, Exchange& exchange, @@ -1981,7 +1981,7 @@ MySqlLeaseMgr::getLeaseCollection(MySqlLeaseContextPtr ctx, } void -MySqlLeaseMgr::getLease(MySqlLeaseContextPtr ctx, +MySqlLeaseMgr::getLease(MySqlLeaseContextPtr& ctx, StatementIndex stindex, MYSQL_BIND* bind, Lease4Ptr& result) const { // Create appropriate collection object and get all leases matching @@ -2001,7 +2001,7 @@ MySqlLeaseMgr::getLease(MySqlLeaseContextPtr ctx, } void -MySqlLeaseMgr::getLease(MySqlLeaseContextPtr ctx, +MySqlLeaseMgr::getLease(MySqlLeaseContextPtr& ctx, StatementIndex stindex, MYSQL_BIND* bind, Lease6Ptr& result) const { // Create appropriate collection object and get all leases matching