DNSName: make dnsdist compile again

This moves the implementation of the Logger::operator<<(const DNSName)
function to the right place. Freeing dnsdist from having to include
the logger.

diff --git a/pdns/dnsdistdist/.gitignore b/pdns/dnsdistdist/.gitignore
index f87753c6c0d07cc7447847ba4eb7a7cfff925924..469535229c97968746589a9de360f72fd1089b64 100644 (file)
--- a/pdns/dnsdistdist/.gitignore
+++ b/pdns/dnsdistdist/.gitignore
@@ -56,3 +56,4 @@
 /sodcrypto.hh
 /sstuff.hh
 /stamp-h1
+/compile

diff --git a/pdns/dnsname.cc b/pdns/dnsname.cc
index 8e953db864174036cd00b6c314709c62c7e6a549..d9bf435fce5119905c7601777bf6f609aa2b32de 100644 (file)
--- a/pdns/dnsname.cc
+++ b/pdns/dnsname.cc
@@ -3,7 +3,6 @@
 #include <string>
 
 #include "dnswriter.hh"
-#include "logger.hh"
 #include "misc.hh"
 
 #include <boost/functional/hash.hpp>
@@ -260,11 +259,3 @@ string DNSName::escapeLabel(const std::string& label)
   }
   return ret;
 }
-
-
-Logger& Logger::operator<<(const DNSName &d)
-{
-  *this<<d.toString();
-
-  return *this;
-}

diff --git a/pdns/logger.cc b/pdns/logger.cc
index e92d4446ddfef2ab809e021cafbf9e510243afbd..3da8de0c6a0e31caf222af4fb63b99af2a306980 100644 (file)
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -215,3 +215,10 @@ Logger& Logger::operator<<(ostream & (&)(ostream &))
   pt->d_urgency=Info;
   return *this;
 }
+
+Logger& Logger::operator<<(const DNSName &d)
+{
+  *this<<d.toString();
+
+  return *this;
+}