[lld] r249622 - ELF2: Rename dupError() -> reportConflict().

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Oct  7 16:37:24 2015
New Revision: 249622

URL: http://llvm.org/viewvc/llvm-project?rev=249622&view=rev
Log:
ELF2: Rename dupError() -> reportConflict().

Modified:
    lld/trunk/ELF/SymbolTable.cpp
    lld/trunk/ELF/SymbolTable.h

Modified: lld/trunk/ELF/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=249622&r1=249621&r2=249622&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.cpp (original)
+++ lld/trunk/ELF/SymbolTable.cpp Wed Oct  7 16:37:24 2015
@@ -179,7 +179,7 @@ void SymbolTable::addELFFile(ELFFileBase
 }
 
 template <class ELFT>
-void SymbolTable::dupError(const SymbolBody &Old, const SymbolBody &New) {
+void SymbolTable::reportConflict(const SymbolBody &Old, const SymbolBody &New) {
   typedef typename ELFFile<ELFT>::Elf_Sym Elf_Sym;
   typedef typename ELFFile<ELFT>::Elf_Sym_Range Elf_Sym_Range;
 
@@ -239,7 +239,7 @@ template <class ELFT> void SymbolTable::
   if (comp < 0)
     Sym->Body = New;
   else if (comp == 0)
-    dupError<ELFT>(*Existing, *New);
+    reportConflict<ELFT>(*Existing, *New);
 }
 
 Symbol *SymbolTable::insert(SymbolBody *New) {

Modified: lld/trunk/ELF/SymbolTable.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=249622&r1=249621&r2=249622&view=diff
==============================================================================
--- lld/trunk/ELF/SymbolTable.h (original)
+++ lld/trunk/ELF/SymbolTable.h Wed Oct  7 16:37:24 2015
@@ -80,7 +80,7 @@ private:
   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;