From 831b59a83fb00621455f63470c9a4ad201b91d70 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Wed, 20 Sep 2023 10:57:39 +0200 Subject: [PATCH] elf-reader, ir: Fix compilation on GCC 4.8.5 * src/abg-elf-reader.cc (reader::initialize): Use older-style initialization to keep the old lady happy. * src/abg-ir-priv.h (canonicalize_types): Avoid using type deduction in this context to keep the old lady happy. Signed-off-by: Dodji Seketeli --- src/abg-elf-reader.cc | 2 +- src/abg-ir-priv.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/abg-elf-reader.cc b/src/abg-elf-reader.cc index f4dae766..afb038ff 100644 --- a/src/abg-elf-reader.cc +++ b/src/abg-elf-reader.cc @@ -311,7 +311,7 @@ struct reader::priv dt_needed.clear(); symt.reset(); debug_info_root_paths = debug_info_roots; - offline_callbacks = {}; + memset(&offline_callbacks, 0, sizeof(offline_callbacks)); dwfl_handle.reset(); elf_module = nullptr; dwarf_handle = nullptr; diff --git a/src/abg-ir-priv.h b/src/abg-ir-priv.h index d0a0c48f..3560fac9 100644 --- a/src/abg-ir-priv.h +++ b/src/abg-ir-priv.h @@ -1330,8 +1330,10 @@ canonicalize_types(const input_iterator& begin, if (begin == end) return; + int i; + input_iterator t; // First, let's compute the canonical type of this type. - for (auto t = begin, i = 0; t != end; ++t, ++i) + for (t = begin,i = 0; t != end; ++t, ++i) { if (deref(t)->get_environment().priv_->do_log()) std::cerr << "#" << std::dec << i << " ";