From deda04f8607f3b5e03aec62a7fb5e03132180a70 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 29 Apr 2021 18:39:12 +0200 Subject: [PATCH] Remove the now empty views.hh header --- .not-formatted | 1 - pdns/Makefile.am | 1 - pdns/dnsdistdist/Makefile.am | 1 - pdns/dnsdistdist/doh.cc | 1 - pdns/dnsdistdist/views.hh | 1 - pdns/dnsparser.hh | 1 - pdns/namespaces.hh | 2 ++ pdns/packetcache.hh | 1 - pdns/recursordist/Makefile.am | 1 - pdns/recursordist/ednsextendederror.cc | 1 - pdns/recursordist/views.hh | 1 - pdns/views.hh | 25 ------------------------- 12 files changed, 2 insertions(+), 35 deletions(-) delete mode 120000 pdns/dnsdistdist/views.hh delete mode 120000 pdns/recursordist/views.hh delete mode 100644 pdns/views.hh diff --git a/.not-formatted b/.not-formatted index 452a903305..00515a259b 100644 --- a/.not-formatted +++ b/.not-formatted @@ -382,7 +382,6 @@ ./pdns/validate.hh ./pdns/version.cc ./pdns/version.hh -./pdns/views.hh ./pdns/webserver.cc ./pdns/webserver.hh ./pdns/ws-api.cc diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 26ee57bb95..7e8479b055 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -267,7 +267,6 @@ pdns_server_SOURCES = \ utility.hh \ uuid-utils.hh uuid-utils.cc \ version.cc version.hh \ - views.hh \ webserver.cc webserver.hh \ ws-api.cc ws-api.hh \ ws-auth.cc ws-auth.hh \ diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index e56c07e263..7287787c77 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -213,7 +213,6 @@ dnsdist_SOURCES = \ tcpiohandler.cc tcpiohandler.hh \ threadname.hh threadname.cc \ uuid-utils.hh uuid-utils.cc \ - views.hh \ xpf.cc xpf.hh testrunner_SOURCES = \ diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc index eba0a9082c..ec58a0c10a 100644 --- a/pdns/dnsdistdist/doh.cc +++ b/pdns/dnsdistdist/doh.cc @@ -29,7 +29,6 @@ #include "dnsdist-xpf.hh" #include "libssl.hh" #include "threadname.hh" -#include "views.hh" /* So, how does this work. We use h2o for our http2 and TLS needs. If the operator has configured multiple IP addresses to listen on, diff --git a/pdns/dnsdistdist/views.hh b/pdns/dnsdistdist/views.hh deleted file mode 120000 index 2213b7d900..0000000000 --- a/pdns/dnsdistdist/views.hh +++ /dev/null @@ -1 +0,0 @@ -../views.hh \ No newline at end of file diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh index fcc63cad86..8d65c93460 100644 --- a/pdns/dnsparser.hh +++ b/pdns/dnsparser.hh @@ -37,7 +37,6 @@ #include "pdnsexception.hh" #include "iputils.hh" #include "svc-records.hh" -#include "views.hh" /** DNS records have three representations: 1) in the packet diff --git a/pdns/namespaces.hh b/pdns/namespaces.hh index cc38242f58..5e7a7d6fa3 100644 --- a/pdns/namespaces.hh +++ b/pdns/namespaces.hh @@ -57,3 +57,5 @@ using std::shared_ptr; using std::string; using std::unique_ptr; using std::vector; + +using pdns_string_view = std::string_view; diff --git a/pdns/packetcache.hh b/pdns/packetcache.hh index da3b62190d..8aa6933f4d 100644 --- a/pdns/packetcache.hh +++ b/pdns/packetcache.hh @@ -23,7 +23,6 @@ #include "ednsoptions.hh" #include "misc.hh" #include "iputils.hh" -#include "views.hh" class PacketCache : public boost::noncopyable { diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am index 64e3c8f9d4..052803e1c1 100644 --- a/pdns/recursordist/Makefile.am +++ b/pdns/recursordist/Makefile.am @@ -190,7 +190,6 @@ pdns_recursor_SOURCES = \ uuid-utils.hh uuid-utils.cc \ validate.cc validate.hh validate-recursor.cc validate-recursor.hh \ version.cc version.hh \ - views.hh \ webserver.cc webserver.hh \ ws-api.cc ws-api.hh \ ws-recursor.cc ws-recursor.hh \ diff --git a/pdns/recursordist/ednsextendederror.cc b/pdns/recursordist/ednsextendederror.cc index cf611d0016..f329842d73 100644 --- a/pdns/recursordist/ednsextendederror.cc +++ b/pdns/recursordist/ednsextendederror.cc @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "ednsextendederror.hh" -#include "views.hh" static bool getEDNSExtendedErrorOptFromStringView(const pdns_string_view& option, EDNSExtendedError& eee) { diff --git a/pdns/recursordist/views.hh b/pdns/recursordist/views.hh deleted file mode 120000 index 2213b7d900..0000000000 --- a/pdns/recursordist/views.hh +++ /dev/null @@ -1 +0,0 @@ -../views.hh \ No newline at end of file diff --git a/pdns/views.hh b/pdns/views.hh deleted file mode 100644 index a9ebedbdd0..0000000000 --- a/pdns/views.hh +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of PowerDNS or dnsdist. - * Copyright -- PowerDNS.COM B.V. and its contributors - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * In addition, for the avoidance of any doubt, permission is granted to - * link this program with OpenSSL and to (re)distribute the binaries - * produced as the result of such linking. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#pragma once - -using pdns_string_view = std::string_view; -- 2.47.2