From c09ce7fd2d62d85dcdf370f4bef732380fca4f1b Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 6 Jan 2017 20:14:02 +0000
Subject: Vendor import of lld trunk r291274:
 https://llvm.org/svn/llvm-project/lld/trunk@291274

---
 COFF/InputFiles.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'COFF/InputFiles.cpp')

diff --git a/COFF/InputFiles.cpp b/COFF/InputFiles.cpp
index 0a97c2185f89..cde355cd3f34 100644
--- a/COFF/InputFiles.cpp
+++ b/COFF/InputFiles.cpp
@@ -372,6 +372,8 @@ MachineTypes BitcodeFile::getMachineType() {
     return IMAGE_FILE_MACHINE_UNKNOWN;
   }
 }
+} // namespace coff
+} // namespace lld
 
 // Returns the last element of a path, which is supposed to be a filename.
 static StringRef getBasename(StringRef Path) {
@@ -382,7 +384,7 @@ static StringRef getBasename(StringRef Path) {
 }
 
 // Returns a string in the format of "foo.obj" or "foo.obj(bar.lib)".
-std::string toString(InputFile *File) {
+std::string lld::toString(coff::InputFile *File) {
   if (!File)
     return "(internal)";
   if (File->ParentName.empty())
@@ -393,6 +395,3 @@ std::string toString(InputFile *File) {
           .str();
   return StringRef(Res).lower();
 }
-
-} // namespace coff
-} // namespace lld
-- 
cgit v1.3