From 64b6fbb6dfc734b6aeeb5412c5148d1db48c11cf Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 11 Dec 2015 21:13:00 +0100 Subject: [PATCH] [4234] Qualified Type in Lease6 constructor --- src/lib/dhcpsrv/lease.cc | 4 ++-- src/lib/dhcpsrv/lease.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/dhcpsrv/lease.cc b/src/lib/dhcpsrv/lease.cc index 854cec4f4c..1927e5f7c4 100755 --- a/src/lib/dhcpsrv/lease.cc +++ b/src/lib/dhcpsrv/lease.cc @@ -228,7 +228,7 @@ Lease4::operator=(const Lease4& other) { return (*this); } -Lease6::Lease6(Type type, const isc::asiolink::IOAddress& addr, +Lease6::Lease6(Lease::Type type, const isc::asiolink::IOAddress& addr, DuidPtr duid, uint32_t iaid, uint32_t preferred, uint32_t valid, uint32_t t1, uint32_t t2, SubnetID subnet_id, const HWAddrPtr& hwaddr, uint8_t prefixlen) @@ -242,7 +242,7 @@ Lease6::Lease6(Type type, const isc::asiolink::IOAddress& addr, cltt_ = time(NULL); } -Lease6::Lease6(Type type, const isc::asiolink::IOAddress& addr, +Lease6::Lease6(Lease::Type type, const isc::asiolink::IOAddress& addr, DuidPtr duid, uint32_t iaid, uint32_t preferred, uint32_t valid, uint32_t t1, uint32_t t2, SubnetID subnet_id, const bool fqdn_fwd, const bool fqdn_rev, diff --git a/src/lib/dhcpsrv/lease.h b/src/lib/dhcpsrv/lease.h index a8b65be51a..99034ea10c 100644 --- a/src/lib/dhcpsrv/lease.h +++ b/src/lib/dhcpsrv/lease.h @@ -430,7 +430,7 @@ struct Lease6 : public Lease { /// @brief Lease type /// /// One of normal address, temporary address, or prefix. - Type type_; + Lease::Type type_; /// @brief IPv6 prefix length /// @@ -467,7 +467,7 @@ struct Lease6 : public Lease { /// @param subnet_id A Subnet identifier. /// @param hwaddr hardware/MAC address (optional) /// @param prefixlen An address prefix length (optional, defaults to 128) - Lease6(Type type, const isc::asiolink::IOAddress& addr, DuidPtr duid, + Lease6(Lease::Type type, const isc::asiolink::IOAddress& addr, DuidPtr duid, uint32_t iaid, uint32_t preferred, uint32_t valid, uint32_t t1, uint32_t t2, SubnetID subnet_id, const HWAddrPtr& hwaddr = HWAddrPtr(), uint8_t prefixlen = 128); @@ -488,7 +488,7 @@ struct Lease6 : public Lease { /// @param hostname FQDN of the client which gets the lease. /// @param hwaddr hardware address (MAC), may be NULL /// @param prefixlen An address prefix length. - Lease6(Type type, const isc::asiolink::IOAddress& addr, DuidPtr duid, + Lease6(Lease::Type type, const isc::asiolink::IOAddress& addr, DuidPtr duid, uint32_t iaid, uint32_t preferred, uint32_t valid, uint32_t t1, uint32_t t2, SubnetID subnet_id, const bool fqdn_fwd, const bool fqdn_rev, const std::string& hostname,