[#2481] unrelated - respect naming convention for structs

diff --git a/src/lib/dhcp/pkt_template.h b/src/lib/dhcp/pkt_template.h
index a018cf616491d970ed96f34ab7a4147e42a46362..8f58bedcc974f4eaadb9cf001dd826331a17cde1 100644 (file)
--- a/src/lib/dhcp/pkt_template.h
+++ b/src/lib/dhcp/pkt_template.h
@@ -20,22 +20,22 @@ namespace dhcp {
 namespace {
 
 template <isc::util::DhcpSpace D>
-struct adapter_Pkt {};
+struct AdapterPkt {};
 
 template <>
-struct adapter_Pkt<isc::util::DHCPv4> {
+struct AdapterPkt<isc::util::DHCPv4> {
     using type = Pkt4;
 };
 
 template <>
-struct adapter_Pkt<isc::util::DHCPv6> {
+struct AdapterPkt<isc::util::DHCPv6> {
     using type = Pkt6;
 };
 
 }  // namespace
 
 template <isc::util::DhcpSpace D>
-using PktT = typename adapter_Pkt<D>::type;
+using PktT = typename AdapterPkt<D>::type;
 
 template <isc::util::DhcpSpace D>
 using PktTPtr = boost::shared_ptr<PktT<D>>;

diff --git a/src/lib/dhcpsrv/lease.h b/src/lib/dhcpsrv/lease.h
index 5f831ff150ca38067d5332e966f8449f7a7b757e..b603ebeee21f3f674ad9e9230d642ccf2a93942c 100644 (file)
--- a/src/lib/dhcpsrv/lease.h
+++ b/src/lib/dhcpsrv/lease.h
@@ -678,22 +678,22 @@ operator<<(std::ostream& os, const Lease& lease);
 namespace {
 
 template <isc::util::DhcpSpace D>
-struct adapter_Lease {};
+struct AdapterLease {};
 
 template <>
-struct adapter_Lease<isc::util::DHCPv4> {
+struct AdapterLease<isc::util::DHCPv4> {
     using type = Lease4;
 };
 
 template <>
-struct adapter_Lease<isc::util::DHCPv6> {
+struct AdapterLease<isc::util::DHCPv6> {
     using type = Lease6;
 };
 
 }  // namespace
 
 template <isc::util::DhcpSpace D>
-using LeaseT = typename adapter_Lease<D>::type;
+using LeaseT = typename AdapterLease<D>::type;
 
 template <isc::util::DhcpSpace D>
 using LeaseTPtr = boost::shared_ptr<LeaseT<D>>;

diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index 4dfad6f3a750344da0475ec8ad0a12224f0f3e6a..2520a63f103ace1a480a34bd98d5ca45a4ed5bbc 100644 (file)
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -1005,22 +1005,22 @@ using SubnetFetcher6 = SubnetFetcher<Subnet6Ptr, Subnet6Collection>;
 namespace {
 
 template <isc::util::DhcpSpace D>
-struct adapter_Subnet {};
+struct AdapterSubnet {};
 
 template <>
-struct adapter_Subnet<isc::util::DHCPv4> {
+struct AdapterSubnet<isc::util::DHCPv4> {
     using type = Subnet4;
 };
 
 template <>
-struct adapter_Subnet<isc::util::DHCPv6> {
+struct AdapterSubnet<isc::util::DHCPv6> {
     using type = Subnet6;
 };
 
 }  // namespace
 
 template <isc::util::DhcpSpace D>
-using SubnetT = typename adapter_Subnet<D>::type;
+using SubnetT = typename AdapterSubnet<D>::type;
 
 template <isc::util::DhcpSpace D>
 using SubnetTPtr = boost::shared_ptr<SubnetT<D>>;