From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Thu, 3 Jan 2019 10:59:04 +0000 (+0100)
Subject: Fix logger time_t issues on at least OpenBSD.
X-Git-Tag: rec-4.2.0-alpha1~66^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a0387f7429710a21af7abcc745c71d6932e14be;p=thirdparty%2Fpdns.git

Fix logger time_t issues on at least OpenBSD.

Use a template to log trivial types. This way the compiler figures
out what logger methods oo generate.
---

diff --git a/pdns/logger.cc b/pdns/logger.cc
index 1766d35ae9..cd56e5d78d 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -184,64 +184,6 @@ Logger& Logger::operator<<(const char *s)
   return *this;
 }
 
-Logger& Logger::operator<<(int i)
-{
-  ostringstream tmp;
-  tmp<<i;
-
-  *this<<tmp.str();
-
-  return *this;
-}
-
-Logger& Logger::operator<<(double i)
-{
-  ostringstream tmp;
-  tmp<<i;
-  *this<<tmp.str();
-  return *this;
-}
-
-Logger& Logger::operator<<(unsigned int i)
-{
-  ostringstream tmp;
-  tmp<<i;
-
-  *this<<tmp.str();
-
-  return *this;
-}
-
-Logger& Logger::operator<<(unsigned long i)
-{
-  ostringstream tmp;
-  tmp<<i;
-
-  *this<<tmp.str();
-
-  return *this;
-}
-
-Logger& Logger::operator<<(unsigned long long i)
-{
-  ostringstream tmp;
-  tmp<<i;
-
-  *this<<tmp.str();
-
-  return *this;
-}
-
-Logger& Logger::operator<<(long i)
-{
-  ostringstream tmp;
-  tmp<<i;
-
-  *this<<tmp.str();
-
-  return *this;
-}
-
 Logger& Logger::operator<<(ostream & (&)(ostream &))
 {
   PerThread* pt =getPerThread();
diff --git a/pdns/logger.hh b/pdns/logger.hh
index 3fb97ee0fc..df0907eb9e 100644
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -81,16 +81,18 @@ public:
   */
   Logger& operator<<(const char *s);
   Logger& operator<<(const string &s);   //!< log a string
-  Logger& operator<<(int);   //!< log an int
-  Logger& operator<<(double);   //!< log a double
-  Logger& operator<<(unsigned int);   //!< log an unsigned int
-  Logger& operator<<(long);   //!< log an unsigned int
-  Logger& operator<<(unsigned long);   //!< log an unsigned int
-  Logger& operator<<(unsigned long long);   //!< log an unsigned 64 bit int
   Logger& operator<<(const DNSName&); 
   Logger& operator<<(const ComboAddress&); //!< log an address
   Logger& operator<<(Urgency);    //!< set the urgency, << style
 
+  // Using const & since otherwise SyncRes:: values induce (illegal) copies
+  template<typename T> Logger & operator<<(const T & i) {
+	ostringstream tmp;
+	tmp<<i;
+	*this<<tmp.str();
+	return *this;
+  }
+
   Logger& operator<<(std::ostream & (&)(std::ostream &)); //!< this is to recognise the endl, and to commit the log
 
 private: