From: Stephen Morris <stephen@persephone.(none)>
Date: Tue, 10 May 2016 14:03:02 +0000 (+0100)
Subject: [4485] Change type of variables to overcome compiler objections
X-Git-Tag: trac4106_update_base~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d3dac9de3ae12e597e4a4e78507f7b0cf2db4f7;p=thirdparty%2Fkea.git

[4485] Change type of variables to overcome compiler objections

One compiler was objecting to placing the address of a size_t variable
into a variable declared as "unsigned long*".  Changing the
declaration from "size_t" to "unsigned long" fixes the problem.
---

diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc
index dfef3373c0..235f71d47f 100644
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -600,7 +600,7 @@ private:
     uint8_t dhcp_identifier_buffer_[DUID::MAX_DUID_LEN];
 
     /// Length of a data in the dhcp_identifier_buffer_.
-    size_t dhcp_identifier_length_;
+    unsigned long dhcp_identifier_length_;
 
     /// Type of the identifier in the dhcp_identifier_buffer_. This
     /// value corresponds to the @ref Host::IdentifierType value.
@@ -865,7 +865,7 @@ private:
     char ipv6_address_buffer_[ADDRESS6_TEXT_MAX_LEN + 1];
 
     /// @brief Length of the textual address representation.
-    size_t ipv6_address_buffer_len_;
+    unsigned long ipv6_address_buffer_len_;
 
     /// @brief Length of the prefix (128 for addresses)
     uint8_t prefix_len_;
@@ -996,7 +996,7 @@ private:
     std::string address_;
 
     /// @brief Length of the textual address representation.
-    size_t address_len_;
+    unsigned long address_len_;
 
      /// @brief Length of the prefix (128 for addresses).
     uint8_t prefix_len_;