From beb8418f4799b50ce414b7a63ac7a2a363dc8a05 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 5 Mar 2015 07:52:41 -0800 Subject: [PATCH] Remove typename on elfcpp::Elf_types::Elf_Addr MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit GCC 4.2 complains: binutils/gold/object.cc:3261: error: using ‘typename’ outside of template This patch removes typename. It works with both GCC 4.2 and 4.8. * output.cc (Relobj::initialize_input_to_output_map): Remove typename on elfcpp::Elf_types::Elf_Addr. --- gold/ChangeLog | 5 +++++ gold/object.cc | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index fe6a56bade5..24d35607741 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2015-03-05 H.J. Lu + + * output.cc (Relobj::initialize_input_to_output_map): + Remove typename on elfcpp::Elf_types::Elf_Addr. + 2015-03-04 Cary Coutant * parameters.cc (Parameters::set_target_once): Call diff --git a/gold/object.cc b/gold/object.cc index 7286e5a1f77..84e4568fc5e 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -3258,18 +3258,18 @@ make_elf_object(const std::string& name, Input_file* input_file, off_t offset, template void Relobj::initialize_input_to_output_map<64>(unsigned int shndx, - typename elfcpp::Elf_types<64>::Elf_Addr starting_address, + elfcpp::Elf_types<64>::Elf_Addr starting_address, Unordered_map::Elf_Addr>* output_addresses) const; + elfcpp::Elf_types<64>::Elf_Addr>* output_addresses) const; #endif #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) template void Relobj::initialize_input_to_output_map<32>(unsigned int shndx, - typename elfcpp::Elf_types<32>::Elf_Addr starting_address, + elfcpp::Elf_types<32>::Elf_Addr starting_address, Unordered_map::Elf_Addr>* output_addresses) const; + elfcpp::Elf_types<32>::Elf_Addr>* output_addresses) const; #endif #ifdef HAVE_TARGET_32_LITTLE -- 2.30.2