From e3fe883a9c8c9643e39eff4a7349faf2993f5899 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 14 May 2019 14:18:11 +0100
Subject: [PATCH] Fix merge issues

---
 exemgr/main.cpp           | 2 +-
 utils/udfsdk/mcsv1_udaf.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index e972c40ad..e66d7783e 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -1298,7 +1298,7 @@ void setupSignalHandlers()
 #endif
 }
 
-void setupCwd(joblist::ResourceManager* rm)
+int8_t setupCwd(joblist::ResourceManager* rm)
 {
     std::string workdir = rm->getScWorkingDir();
     int8_t rc = chdir(workdir.c_str());
diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h
index afcbb362f..d55002c49 100644
--- a/utils/udfsdk/mcsv1_udaf.h
+++ b/utils/udfsdk/mcsv1_udaf.h
@@ -1029,7 +1029,7 @@ inline T mcsv1_UDAF::convertAnyTo(static_any::any& valIn)
     }
     else
     {
-        throw runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
+        throw std::runtime_error("mcsv1_UDAF::convertAnyTo(): input param has unrecognized type");
     }
     return val;
 }