From ce039266c11a521f6702f413e04875c29d340822 Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Fri, 6 Jan 2017 10:04:08 +0000
Subject: Merge elf::toString and coff::toString.

The two overloaded functions hid each other. This patch merges them.

llvm-svn: 291222
---
 lld/ELF/InputSection.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lld/ELF/InputSection.cpp')

diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 805e51dab50..e87d92aa207 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -34,7 +34,7 @@ using namespace lld::elf;
 
 // Returns a string to construct an error message.
 template <class ELFT>
-std::string elf::toString(const InputSectionBase<ELFT> *Sec) {
+std::string lld::toString(const InputSectionBase<ELFT> *Sec) {
   return (Sec->getFile()->getName() + ":(" + Sec->Name + ")").str();
 }
 
@@ -844,7 +844,7 @@ template class elf::MergeInputSection<ELF32BE>;
 template class elf::MergeInputSection<ELF64LE>;
 template class elf::MergeInputSection<ELF64BE>;
 
-template std::string elf::toString(const InputSectionBase<ELF32LE> *);
-template std::string elf::toString(const InputSectionBase<ELF32BE> *);
-template std::string elf::toString(const InputSectionBase<ELF64LE> *);
-template std::string elf::toString(const InputSectionBase<ELF64BE> *);
+template std::string lld::toString(const InputSectionBase<ELF32LE> *);
+template std::string lld::toString(const InputSectionBase<ELF32BE> *);
+template std::string lld::toString(const InputSectionBase<ELF64LE> *);
+template std::string lld::toString(const InputSectionBase<ELF64BE> *);
-- 
cgit v1.2.3