From 262ddba25c4366cbdd2cc56fbb29843702c14bee Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Apr 2016 23:02:39 +0200 Subject: [PATCH] Work around gcc 2 member template issue Fixes the gcc 2 build. --- src/apps/debugger/elf/ElfFile.h | 7 ++++--- src/apps/debugger/elf/ElfSymbolLookup.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/apps/debugger/elf/ElfFile.h b/src/apps/debugger/elf/ElfFile.h index 0ff719a440..d2a6e442b3 100644 --- a/src/apps/debugger/elf/ElfFile.h +++ b/src/apps/debugger/elf/ElfFile.h @@ -142,10 +142,11 @@ public: template Value Get(const Value& value) const - { return Get(value, fSwappedByteOrder); } + { return StaticGet(value, + fSwappedByteOrder); } template - static Value Get(const Value& value, + static Value StaticGet(const Value& value, bool swappedByteOrder); private: @@ -191,7 +192,7 @@ private: template /*static*/ inline Value -ElfFile::Get(const Value& value, bool swappedByteOrder) +ElfFile::StaticGet(const Value& value, bool swappedByteOrder) { if (!swappedByteOrder) return value; diff --git a/src/apps/debugger/elf/ElfSymbolLookup.cpp b/src/apps/debugger/elf/ElfSymbolLookup.cpp index 42219dcd17..69dc41edb1 100644 --- a/src/apps/debugger/elf/ElfSymbolLookup.cpp +++ b/src/apps/debugger/elf/ElfSymbolLookup.cpp @@ -159,7 +159,7 @@ public: template Value Get(const Value& value) const { - return ElfFile::Get(value, fSwappedByteOrder); + return ElfFile::StaticGet(value, fSwappedByteOrder); } void SetSource(ElfSymbolLookupSource* source)