From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Sat, 11 Jul 2015 08:17:51 +0000 (+0200)
Subject: DNSName: make dnsdist compile again
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~57^2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd72bfaa8886b68dca265cdf7191a1bbcb29b3c5;p=thirdparty%2Fpdns.git

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 f87753c6c0..469535229c 100644
--- 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 8e953db864..d9bf435fce 100644
--- 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 e92d4446dd..3da8de0c6a 100644
--- 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;
+}