From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 8 Sep 2016 08:34:45 +0000 (+0200)
Subject: rec: Fix Lua-enabled compilation on OS X and FreeBSD
X-Git-Tag: rec-4.0.4~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8a00d4e3959adac58b201ec61e8a82e95da06bc;p=pdns

rec: Fix Lua-enabled compilation on OS X and FreeBSD

(cherry picked from commit 546d1fbf9efe8a4ba81c92d43bc43be457e60713)
---

diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc
index ab3637c2e..f4d29ff79 100644
--- a/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@ -263,8 +263,8 @@ RecursorLua4::RecursorLua4(const std::string& fname)
       return DNSName(boost::get<const DNSName>(dom));
   });
   d_lw->registerFunction("isPartOf", &DNSName::isPartOf);
-  d_lw->registerFunction("countLabels", &DNSName::countLabels);
-  d_lw->registerFunction("wirelength", &DNSName::wirelength);
+  d_lw->registerFunction<unsigned int(DNSName::*)()>("countLabels", [](const DNSName& name) { return name.countLabels(); });
+  d_lw->registerFunction<size_t(DNSName::*)()>("wirelength", [](const DNSName& name) { return name.wirelength(); });
   d_lw->registerFunction<bool(DNSName::*)(const std::string&)>(
     "equal",
      [](const DNSName& lhs, const std::string& rhs) {
@@ -285,9 +285,9 @@ RecursorLua4::RecursorLua4(const std::string& fname)
     } );
   d_lw->registerFunction<bool(ComboAddress::*)()>("isIPv4", [](const ComboAddress& ca) { return ca.sin4.sin_family == AF_INET; });
   d_lw->registerFunction<bool(ComboAddress::*)()>("isIPv6", [](const ComboAddress& ca) { return ca.sin4.sin_family == AF_INET6; });
-  d_lw->registerFunction("isMappedIPv4", &ComboAddress::isMappedIPv4);
-  d_lw->registerFunction("mapToIPv4", &ComboAddress::mapToIPv4);
-  d_lw->registerFunction("truncate", &ComboAddress::truncate);
+  d_lw->registerFunction<bool(ComboAddress::*)()>("isMappedIPv4", [](const ComboAddress& ca) { return ca.isMappedIPv4(); });
+  d_lw->registerFunction<ComboAddress(ComboAddress::*)()>("mapToIPv4", [](const ComboAddress& ca) { return ca.mapToIPv4(); });
+  d_lw->registerFunction<void(ComboAddress::*)(unsigned int)>("truncate", [](ComboAddress& ca, unsigned int bits) { ca.truncate(bits); });
 
   d_lw->writeFunction("newCA", [](const std::string& a) { return ComboAddress(a); });
   typedef std::unordered_set<ComboAddress,ComboAddress::addressOnlyHash,ComboAddress::addressOnlyEqual> cas_t;