From 9bcc1e819aa4bfbb281af84be6e0f0cc7cb25812 Mon Sep 17 00:00:00 2001
From: Razvan Becheriu <razvan@isc.org>
Date: Tue, 21 Jan 2020 16:44:13 +0200
Subject: [PATCH] [#1071] always cast to target type

---
 src/lib/dhcpsrv/mysql_host_data_source.cc | 6 +-----
 src/lib/dhcpsrv/mysql_lease_mgr.cc        | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc
index 505496e7fe..73c4134213 100644
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -189,11 +189,7 @@ public:
                                    std::vector<my_bools>& error) {
         for (size_t i = 0; i < error.size(); ++i) {
             error[i] = MLM_FALSE;
-#ifdef HAVE_MYSQL_MY_BOOL
-            bind[i].error = reinterpret_cast<char*>(&error[i]);
-#else
-            bind[i].error = reinterpret_cast<bool*>(&error[i]);
-#endif
+            bind[i].error = reinterpret_cast<my_bool*>(&error[i]);
         }
     };
 
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index bb547daad9..eba62afd9f 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -355,11 +355,8 @@ public:
                                    size_t count) {
         for (size_t i = 0; i < count; ++i) {
             error[i] = MLM_FALSE;
-#ifdef HAVE_MYSQL_MY_BOOL
-            bind[i].error = reinterpret_cast<char*>(&error[i]);
-#else
-            bind[i].error = &error[i];
 #endif
+            bind[i].error = reinterpret_cast<my_bool*>(&error[i]);
         }
     }
 
-- 
GitLab