From af08132de6a686292812375b0fd622b4afb084aa Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Mon, 1 Mar 2021 08:37:22 -0800
Subject: [PATCH] Updates for ubuntu20
---
include/ehwrite.h | 2 +-
src/cmdstr.hpp | 1 +
src/ehwrite.cpp | 2 +-
src/zipr.cpp | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/ehwrite.h b/include/ehwrite.h
index 4ea9e8b70..30a28ebca 100644
--- a/include/ehwrite.h
+++ b/include/ehwrite.h
@@ -129,7 +129,7 @@ namespace EhWriter
ret += string(reinterpret_cast<const char*>(&handle.handler_rva) , 4);
ret += string(reinterpret_cast<const char*>(handle.user_data.data()), handle.user_data.size());
- return move(ret);
+ return ret;
}
diff --git a/src/cmdstr.hpp b/src/cmdstr.hpp
index eeccc1bb0..00e2b397f 100644
--- a/src/cmdstr.hpp
+++ b/src/cmdstr.hpp
@@ -12,6 +12,7 @@
#include <string>
#include <vector>
#include <array>
+#include <functional>
using namespace std;
diff --git a/src/ehwrite.cpp b/src/ehwrite.cpp
index 2a00872e5..c754589b2 100644
--- a/src/ehwrite.cpp
+++ b/src/ehwrite.cpp
@@ -133,7 +133,7 @@ typename PEEhWriter_t<ptrsize>::SehVector_t PEEhWriter_t<ptrsize>::BuildSehVect
cout << "# ATTRIBUTE ExceptionHandlerWrite::unwinds_calculated=" << dec << unwind_infos << endl;
cout << "# ATTRIBUTE ExceptionHandlerWrite::insns_with_eh_info=" << dec << insns_with_frame << endl;
cout << "# ATTRIBUTE ExceptionHandlerWrite::avg_insns_per_fde =" << dec << avg_insn_per_unwind << endl;
- return move(all_unwind_infos);
+ return (all_unwind_infos);
}
template<int ptrsize>
diff --git a/src/zipr.cpp b/src/zipr.cpp
index 20f4b14e9..943bad1b0 100644
--- a/src/zipr.cpp
+++ b/src/zipr.cpp
@@ -146,7 +146,7 @@ ZiprImpl_t::~ZiprImpl_t()
{
m_pqxx_interface->commit();
}
- catch (DatabaseError_t pnide)
+ catch (const DatabaseError_t& pnide)
{
cout<<"Unexpected database error: "<<pnide<<endl;
}
--
GitLab