summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2015-07-09 22:42:21 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2015-07-09 22:42:21 +0000
commit549820b66aa30c74216c5d8b884193e3b9a8cbd0 (patch)
treeeae88dd8f69fbf2dd6382cab7794d2b72fb1b9b1
parent20546ffd4aa654066d7af1eed475598c1f1ac7b9 (diff)
downloadbcm5719-llvm-549820b66aa30c74216c5d8b884193e3b9a8cbd0.tar.gz
bcm5719-llvm-549820b66aa30c74216c5d8b884193e3b9a8cbd0.zip
Fix shadowing.
llvm-svn: 241870
-rw-r--r--llvm/include/llvm/Object/ELF.h2
-rw-r--r--llvm/include/llvm/Object/ELFTypes.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/Object/ELF.h b/llvm/include/llvm/Object/ELF.h
index 068fc32f3a2..369b43a9d22 100644
--- a/llvm/include/llvm/Object/ELF.h
+++ b/llvm/include/llvm/Object/ELF.h
@@ -140,7 +140,7 @@ public:
typedef Elf_Verneed_Impl<ELFT> Elf_Verneed;
typedef Elf_Vernaux_Impl<ELFT> Elf_Vernaux;
typedef Elf_Versym_Impl<ELFT> Elf_Versym;
- typedef Elf_Hash<ELFT> Elf_Hash;
+ typedef Elf_Hash_Impl<ELFT> Elf_Hash;
typedef ELFEntityIterator<const Elf_Dyn> Elf_Dyn_Iter;
typedef iterator_range<Elf_Dyn_Iter> Elf_Dyn_Range;
typedef ELFEntityIterator<const Elf_Rela> Elf_Rela_Iter;
diff --git a/llvm/include/llvm/Object/ELFTypes.h b/llvm/include/llvm/Object/ELFTypes.h
index 1e6e20e0013..27e987ba285 100644
--- a/llvm/include/llvm/Object/ELFTypes.h
+++ b/llvm/include/llvm/Object/ELFTypes.h
@@ -466,7 +466,7 @@ struct Elf_Phdr_Impl<ELFType<TargetEndianness, true>> {
// ELFT needed for endianess.
template <class ELFT>
-struct Elf_Hash {
+struct Elf_Hash_Impl {
LLVM_ELF_IMPORT_TYPES_ELFT(ELFT)
Elf_Word nbucket;
Elf_Word nchain;
OpenPOWER on IntegriCloud