From b83c21d891ba9ef7ae86155936ad6fc9e0777850 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Wed, 2 May 2018 09:40:27 +0100
Subject: [PATCH] MCOL-1376 Fix compiler errors in Ubuntu 18.04

Ubuntu 18.04 uses GCC 7.3 which is a little stricter than before.

Fixes a few errors due to implicit includes that are no longer implicit
and a ton of warnings about the implied alignment of code in
utils/common/any.hpp
---
 dbcon/joblist/tupleunion.cpp        |  6 +++---
 utils/common/any.hpp                | 28 +++++++++++++++++++---------
 utils/common/cgroupconfigurator.cpp |  1 +
 utils/threadpool/threadpool.cpp     |  1 +
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dbcon/joblist/tupleunion.cpp b/dbcon/joblist/tupleunion.cpp
index 77665ae90..d0892e45f 100644
--- a/dbcon/joblist/tupleunion.cpp
+++ b/dbcon/joblist/tupleunion.cpp
@@ -48,7 +48,7 @@ using namespace dataconvert;
 namespace
 {
 //returns the value of 10 raised to the power x.
-inline double pow10(double x)
+inline double exp10(double x)
 {
     return exp(x * M_LN10);
 }
@@ -460,7 +460,7 @@ void TupleUnion::normalize(const Row& in, Row* out)
                         if (in.getScale(i))
                         {
                             double d = in.getIntField(i);
-                            d /= pow10(in.getScale(i));
+                            d /= exp10(in.getScale(i));
                             os.precision(15);
                             os << d;
                         }
@@ -570,7 +570,7 @@ dec1:
                         if (in.getScale(i))
                         {
                             double d = in.getUintField(i);
-                            d /= pow10(in.getScale(i));
+                            d /= exp10(in.getScale(i));
                             os.precision(15);
                             os << d;
                         }
diff --git a/utils/common/any.hpp b/utils/common/any.hpp
index 5265015f1..be0ca679b 100755
--- a/utils/common/any.hpp
+++ b/utils/common/any.hpp
@@ -54,15 +54,25 @@ namespace anyimpl
 	template<typename T>
 	struct big_any_policy : typed_base_any_policy<T>
 	{
-		virtual void static_delete(void** x) { if (*x) 
-			delete(*reinterpret_cast<T**>(x)); *x = NULL; }
-		virtual void copy_from_value(void const* src, void** dest) { 
-		   *dest = new T(*reinterpret_cast<T const*>(src)); }
-		virtual void clone(void* const* src, void** dest) { 
-		   *dest = new T(**reinterpret_cast<T* const*>(src)); }
-		virtual void move(void* const* src, void** dest) { 
-		  (*reinterpret_cast<T**>(dest))->~T(); 
-		  **reinterpret_cast<T**>(dest) = **reinterpret_cast<T* const*>(src); }
+		virtual void static_delete(void** x)
+        {
+            if (*x)
+    			delete(*reinterpret_cast<T**>(x));
+            *x = NULL;
+        }
+		virtual void copy_from_value(void const* src, void** dest)
+        {
+		   *dest = new T(*reinterpret_cast<T const*>(src));
+        }
+		virtual void clone(void* const* src, void** dest)
+        {
+		   *dest = new T(**reinterpret_cast<T* const*>(src));
+        }
+		virtual void move(void* const* src, void** dest)
+        {
+		  (*reinterpret_cast<T**>(dest))->~T();
+		  **reinterpret_cast<T**>(dest) = **reinterpret_cast<T* const*>(src);
+        }
 		virtual void* get_value(void** src) { return *src; }
 	};
 
diff --git a/utils/common/cgroupconfigurator.cpp b/utils/common/cgroupconfigurator.cpp
index a5c736027..2be36b3a8 100644
--- a/utils/common/cgroupconfigurator.cpp
+++ b/utils/common/cgroupconfigurator.cpp
@@ -19,6 +19,7 @@
 #include "configcpp.h"
 #include "logger.h"
 #include <fstream>
+#include <iostream>
 #include <boost/regex.hpp>
 #ifdef _MSC_VER
 #include "unistd.h"
diff --git a/utils/threadpool/threadpool.cpp b/utils/threadpool/threadpool.cpp
index 8b3b40ecd..f1aa4ec19 100644
--- a/utils/threadpool/threadpool.cpp
+++ b/utils/threadpool/threadpool.cpp
@@ -21,6 +21,7 @@
 *
 ***********************************************************************/
 #include <stdexcept>
+#include <iostream>
 using namespace std;
 
 #include "messageobj.h"