Remove the now empty views.hh header

diff --git a/.not-formatted b/.not-formatted
index 452a9033052bea1eae8875ef98e72bf1ef24771e..00515a259b2a7fb305ce9f73c3c2c022f99e9633 100644 (file)
--- 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 26ee57bb95d63180e26997ca7d6715f361e7dc7e..7e8479b05560c0158617f9f72360ae9c30f692dd 100644 (file)
--- 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 e56c07e2636c80461a8cdb04623b7f27da1f39e7..7287787c77e93b38c064a7fe940704d0393fb86b 100644 (file)
--- 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 eba0a9082c81a4e35d38c7bd3f686f0cbc320e7c..ec58a0c10a1f2451f0980e7557929a1f32c64d3d 100644 (file)
--- 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 (symlink)
index 2213b7d..0000000
--- 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 fcc63cad8603dccb0cf9159dcd8d24bedcaab17c..8d65c934604f1477adfdff5e39263b01a086d8a4 100644 (file)
--- 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 cc38242f586c645ef8803ff3003f93237adc0798..5e7a7d6fa3a22fe840cd20183862402a95c0b5ff 100644 (file)
--- 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 da3b62190d34af9e2ab0baa0ea5fab9bf314371d..8aa6933f4d3288dc6ed7af0fb57c655ae3a36541 100644 (file)
--- 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 64e3c8f9d4323185e05f827b91517bc3724c21eb..052803e1c125c11e47e6e688c2e523e04e2e098f 100644 (file)
--- 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 cf611d0016a757369867046a2dc7d6f44d3d25da..f329842d7332be6a3a20ca5d42dbf44f93b5e7f3 100644 (file)
--- 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 (symlink)
index 2213b7d..0000000
--- 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 (file)
index a9ebedb..0000000
--- 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;