]> granicus.if.org Git - pdns/commitdiff
Merge pull request #5799 from rgacogne/rec-shadow-variables
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Mon, 30 Oct 2017 08:54:43 +0000 (09:54 +0100)
committerGitHub <noreply@github.com>
Mon, 30 Oct 2017 08:54:43 +0000 (09:54 +0100)
Fix shadowed variables

1  2 
pdns/dnsdist.cc
pdns/pdns_recursor.cc
pdns/recursordist/test-syncres_cc.cc
pdns/syncres.cc
pdns/test-dnsname_cc.cc

diff --cc pdns/dnsdist.cc
Simple merge
Simple merge
Simple merge
diff --cc pdns/syncres.cc
Simple merge
Simple merge