diff options
author | Rui Ueyama <ruiu@google.com> | 2017-01-06 10:04:08 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2017-01-06 10:04:08 +0000 |
commit | ce039266c11a521f6702f413e04875c29d340822 (patch) | |
tree | 15f5bf2b921192ed4c5b10b6cbbf3e4e4b8ad579 /lld/COFF/InputFiles.cpp | |
parent | dac6169214760886e974b622eda38c25af353fcb (diff) | |
download | bcm5719-llvm-ce039266c11a521f6702f413e04875c29d340822.tar.gz bcm5719-llvm-ce039266c11a521f6702f413e04875c29d340822.zip |
Merge elf::toString and coff::toString.
The two overloaded functions hid each other. This patch merges them.
llvm-svn: 291222
Diffstat (limited to 'lld/COFF/InputFiles.cpp')
-rw-r--r-- | lld/COFF/InputFiles.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp index 0a97c2185f8..cde355cd3f3 100644 --- a/lld/COFF/InputFiles.cpp +++ b/lld/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 |