From: Pieter Lexis Date: Fri, 11 Aug 2017 12:08:44 +0000 (+0200) Subject: Convert timestamps in TimedIPSetRule to time_t X-Git-Tag: rec-4.1.0-rc1~40^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a9b471c4cef380a2f6d4fbe9fc685ce9785f7f7;p=thirdparty%2Fpdns.git Convert timestamps in TimedIPSetRule to time_t This would lead to signed/unsigned comparison warnings on ARM. --- diff --git a/pdns/dnsrulactions.hh b/pdns/dnsrulactions.hh index 33e1d7da72..c00452cfa2 100644 --- a/pdns/dnsrulactions.hh +++ b/pdns/dnsrulactions.hh @@ -272,8 +272,8 @@ private: return ah & (bh<<1); } }; - std::unordered_map d_ip6s; - std::unordered_map d_ip4s; + std::unordered_map d_ip6s; + std::unordered_map d_ip4s; mutable pthread_rwlock_t d_lock4; mutable pthread_rwlock_t d_lock6; };