From 3ae265d7cfbd01c2fa3455b82620899e66ac2c1f Mon Sep 17 00:00:00 2001
From: gitlab-runner <gitlab-runner@git.zephyr-software.com>
Date: Sun, 8 Jan 2023 22:55:09 +0000
Subject: [PATCH] Update to build safely on older gcc that support c++14
---
zipr/include/ehwrite.h | 2 +-
zipr/src/ehwrite.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zipr/include/ehwrite.h b/zipr/include/ehwrite.h
index 30a28ebca..57a84a774 100644
--- a/zipr/include/ehwrite.h
+++ b/zipr/include/ehwrite.h
@@ -143,7 +143,7 @@ namespace EhWriter
class PEEhWriter_t : public EhWriter_t
{
private:
- using SehVector_t = vector<unique_ptr<PE_unwind_info_t> > ;
+ using SehVector_t = vector<shared_ptr<PE_unwind_info_t> > ;
SehVector_t BuildSehVector();
void LayoutSehVector (const SehVector_t& seh_vector);
diff --git a/zipr/src/ehwrite.cpp b/zipr/src/ehwrite.cpp
index 8600c78b3..4ab686bb8 100644
--- a/zipr/src/ehwrite.cpp
+++ b/zipr/src/ehwrite.cpp
@@ -82,7 +82,7 @@ typename PEEhWriter_t<ptrsize>::SehVector_t PEEhWriter_t<ptrsize>::BuildSehVect
// build the unwind directory and unwind info
auto insns_with_frame = 0u;
auto current_unwind_info = unique_ptr<PE_unwind_info_t>();
- auto all_unwind_infos = vector<unique_ptr<PE_unwind_info_t> >();
+ auto all_unwind_infos = PEEhWriter_t<ptrsize>::SehVector_t();
// generate an unwind info struct for each chunk of code in the output program.
--
GitLab