commit e1f91529c862b75186ac4a77aa207444b566ebda
author Rui Ueyama <ruiu@google.com> Wed Oct 07 21:37:24 2015 +0000
committer Rui Ueyama <ruiu@google.com> Wed Oct 07 21:37:24 2015 +0000
tree a4a6c5f0ae3f6004c3034224880bc4a5d693b8a5
parent 6af5f82c203f6f19b3e39c6fbfacf424e24c5cb0

ELF2: Rename dupError() -> reportConflict().

llvm-svn: 249622

lld/ELF/SymbolTable.h

diff --git a/lld/ELF/SymbolTable.h b/lld/ELF/SymbolTable.h
index b545198..2ebec30 100644
--- a/lld/ELF/SymbolTable.h
+++ b/lld/ELF/SymbolTable.h
@@ -80,7 +80,7 @@
   template <class ELFT> void init(uint16_t EMachine);
   template <class ELFT> void resolve(SymbolBody *Body);
   template <class ELFT>
-  void dupError(const SymbolBody &Old, const SymbolBody &New);
+  void reportConflict(const SymbolBody &Old, const SymbolBody &New);
 
   std::vector<std::unique_ptr<ArchiveFile>> ArchiveFiles;