From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 7 Sep 2018 15:33:04 +0000 (+0200)
Subject: [#28,!20] Removed const qualifiers that seem to confuse gcc.
X-Git-Tag: 134-bugs--xcode-10_base~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2120cd1f219f7d5896eadf6fe9bffb81be556a5e;p=thirdparty%2Fkea.git

[#28,!20] Removed const qualifiers that seem to confuse gcc.
---

diff --git a/src/lib/config_backend/tests/config_backend_mgr_unittest.cc b/src/lib/config_backend/tests/config_backend_mgr_unittest.cc
index a2568b6293..37e5f250aa 100644
--- a/src/lib/config_backend/tests/config_backend_mgr_unittest.cc
+++ b/src/lib/config_backend/tests/config_backend_mgr_unittest.cc
@@ -248,7 +248,7 @@ public:
                             const ServerSelector& server_selector =
                             ServerSelector::ALL()) const {
         int property;
-        getPropertyPtrConst<int, const std::string&, const int>
+        getPropertyPtrConst<int, const std::string&, int>
             (&TestConfigBackend::getProperty, selector, server_selector, property,
              property_name, property_value);
         return (property);
diff --git a/src/lib/dhcpsrv/config_backend_pool_dhcp4.cc b/src/lib/dhcpsrv/config_backend_pool_dhcp4.cc
index 24b6272cec..9b01e6b947 100644
--- a/src/lib/dhcpsrv/config_backend_pool_dhcp4.cc
+++ b/src/lib/dhcpsrv/config_backend_pool_dhcp4.cc
@@ -96,7 +96,7 @@ ConfigBackendPoolDHCPv4::getOptionDef4(const BackendSelector& backend_selector,
                                        const uint16_t code,
                                        const std::string& space) const {
     OptionDefinitionPtr option_def;
-    getPropertyPtrConst<OptionDefinitionPtr, const uint16_t, const std::string&>
+    getPropertyPtrConst<OptionDefinitionPtr, uint16_t, const std::string&>
         (&ConfigBackendDHCPv4::getOptionDef4, backend_selector, server_selector,
          option_def, code, space);
     return (option_def);
@@ -227,7 +227,7 @@ ConfigBackendPoolDHCPv4::createUpdateGlobalParameter4(const BackendSelector& bac
                                                       const ServerSelector& server_selector,
                                                       const std::string& name,
                                                       const int64_t value) {
-    createUpdateDeleteProperty<const std::string&, const int64_t>
+    createUpdateDeleteProperty<const std::string&, int64_t>
         (&ConfigBackendDHCPv4::createUpdateGlobalParameter4, backend_selector,
          server_selector, name, value);
 }
@@ -278,7 +278,7 @@ ConfigBackendPoolDHCPv4::deleteOptionDef4(const BackendSelector& backend_selecto
                                           const ServerSelector& server_selector,
                                           const uint16_t code,
                                           const std::string& space) {
-    createUpdateDeleteProperty<const uint16_t, const std::string&>
+    createUpdateDeleteProperty<uint16_t, const std::string&>
         (&ConfigBackendDHCPv4::deleteOptionDef4, backend_selector,
          server_selector, code, space);
 }
@@ -295,7 +295,7 @@ ConfigBackendPoolDHCPv4::deleteOption4(const BackendSelector& backend_selector,
                                        const ServerSelector& server_selector,
                                        const uint16_t code,
                                        const std::string& space) {
-    createUpdateDeleteProperty<const uint16_t, const std::string&>
+    createUpdateDeleteProperty<uint16_t, const std::string&>
         (&ConfigBackendDHCPv4::deleteOption4, backend_selector, server_selector,
          code, space);
 }
@@ -306,7 +306,7 @@ ConfigBackendPoolDHCPv4::deleteOption4(const BackendSelector& backend_selector,
                                        const SubnetID& subnet_id,
                                        const uint16_t code,
                                        const std::string& space) {
-    createUpdateDeleteProperty<const SubnetID&, const uint16_t, const std::string&>
+    createUpdateDeleteProperty<const SubnetID&, uint16_t, const std::string&>
         (&ConfigBackendDHCPv4::deleteOption4, backend_selector, server_selector,
          subnet_id, code, space);
 }
@@ -318,7 +318,7 @@ ConfigBackendPoolDHCPv4::deleteOption4(const BackendSelector& backend_selector,
                                        const asiolink::IOAddress& pool_end_address,
                                        const uint16_t code,
                                        const std::string& space) {
-    createUpdateDeleteProperty<const IOAddress&, const IOAddress&, const uint16_t,
+    createUpdateDeleteProperty<const IOAddress&, const IOAddress&, uint16_t,
                                const std::string&>
         (&ConfigBackendDHCPv4::deleteOption4, backend_selector, server_selector,
          pool_start_address, pool_end_address, code, space);
@@ -335,7 +335,7 @@ ConfigBackendPoolDHCPv4::deleteGlobalParameter4(const BackendSelector& backend_s
 
 void
 ConfigBackendPoolDHCPv4::deleteAllGlobalParameters4(const BackendSelector& backend_selector,
-                                                   const ServerSelector& server_selector) {
+                                                    const ServerSelector& server_selector) {
     createUpdateDeleteProperty<>
         (&ConfigBackendDHCPv4::deleteAllGlobalParameters4, backend_selector,
          server_selector);