From 2a46806b62d969d022ddfa48f87b42816a1f2273 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 9 Jun 2020 13:18:58 +0200 Subject: [PATCH] Do not use using namespace std; it causes ambiguity if both std::string_view and boost::string_view are in scope --- pdns/dnsdistdist/doh.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc index 16132d9874..ff1dbc2710 100644 --- a/pdns/dnsdistdist/doh.cc +++ b/pdns/dnsdistdist/doh.cc @@ -31,8 +31,6 @@ #include "threadname.hh" #include "views.hh" -using namespace std; - /* 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, we launch multiple h2o listener threads. We can hook in to multiple @@ -837,7 +835,7 @@ try } return 0; } -catch(const exception& e) + catch(const std::exception& e) { errlog("DOH Handler function failed with error %s", e.what()); return 0; -- 2.47.2