LEAmDNS - consistent const <-> non-const accessors

mcspr · mcspr · commit d5a5b17c8d5b · 2025-05-14T01:21:32.000+03:00
&gt; error: infinite recursion detected [-Werror=infinite-recursion]
diff --git a/libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp b/libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
@@ -1735,15 +1735,6 @@ namespace MDNSImplementation
     const MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcIP4Address*
     MDNSResponder::stcMDNSServiceQuery::stcAnswer::findIP4Address(
         const IPAddress& p_IPAddress) const
-    {
-        return (stcIP4Address*)(((const stcAnswer*)this)->findIP4Address(p_IPAddress));
-    }
-
-    /*
-        MDNSResponder::stcMDNSServiceQuery::stcAnswer::findIP4Address
-    */
-    MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcIP4Address*
-    MDNSResponder::stcMDNSServiceQuery::stcAnswer::findIP4Address(const IPAddress& p_IPAddress)
     {
         stcIP4Address* pIP4Address = m_pIP4Addresses;
         while (pIP4Address)
@@ -1757,6 +1748,16 @@ namespace MDNSImplementation
         return pIP4Address;
     }
 
+    /*
+        MDNSResponder::stcMDNSServiceQuery::stcAnswer::findIP4Address
+    */
+    MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcIP4Address*
+    MDNSResponder::stcMDNSServiceQuery::stcAnswer::findIP4Address(const IPAddress& p_IPAddress)
+    {
+        const auto& cref = static_cast<const decltype(*this)>(*this);
+        return const_cast<stcIP4Address*>(cref.findIP4Address(p_IPAddress));
+    }
+
     /*
         MDNSResponder::stcMDNSServiceQuery::stcAnswer::IP4AddressCount
     */
@@ -2033,7 +2034,8 @@ namespace MDNSImplementation
     MDNSResponder::stcMDNSServiceQuery::stcAnswer*
     MDNSResponder::stcMDNSServiceQuery::answerAtIndex(uint32_t p_u32Index)
     {
-        return (stcAnswer*)(((const stcMDNSServiceQuery*)this)->answerAtIndex(p_u32Index));
+        const auto& cref = static_cast<const decltype(*this)>(*this);
+        return const_cast<stcAnswer*>(cref.answerAtIndex(p_u32Index));
     }
 
     /*
