[lld] r192169 - Rename GnuLd's path() too.
Rui Ueyama
ruiu at google.com
Mon Oct 7 22:23:03 PDT 2013
Author: ruiu
Date: Tue Oct 8 00:23:03 2013
New Revision: 192169
URL: http://llvm.org/viewvc/llvm-project?rev=192169&view=rev
Log:
Rename GnuLd's path() too.
Modified:
lld/trunk/include/lld/Driver/GnuLdInputGraph.h
lld/trunk/lib/Driver/GnuLdDriver.cpp
Modified: lld/trunk/include/lld/Driver/GnuLdInputGraph.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/GnuLdInputGraph.h?rev=192169&r1=192168&r2=192169&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/GnuLdInputGraph.h (original)
+++ lld/trunk/include/lld/Driver/GnuLdInputGraph.h Tue Oct 8 00:23:03 2013
@@ -42,7 +42,7 @@ public:
return a->kind() == InputElement::Kind::File;
}
- virtual llvm::ErrorOr<StringRef> path(const LinkingContext &ctx) const;
+ virtual ErrorOr<StringRef> getPath(const LinkingContext &ctx) const;
/// \brief validates the Input Element
virtual bool validate() { return true; }
@@ -52,7 +52,7 @@ public:
/// \brief Dump the Input Element
virtual bool dump(raw_ostream &diagnostics) {
- diagnostics << "Name : " << *path(_elfLinkingContext) << "\n";
+ diagnostics << "Name : " << *getPath(_elfLinkingContext) << "\n";
diagnostics << "Type : "
<< "ELF File"
<< "\n";
@@ -72,7 +72,7 @@ public:
/// \brief Parse the input file to lld::File.
llvm::error_code parse(const LinkingContext &ctx, raw_ostream &diagnostics) {
- ErrorOr<StringRef> filePath = path(ctx);
+ ErrorOr<StringRef> filePath = getPath(ctx);
if (!filePath &&
error_code(filePath) == llvm::errc::no_such_file_or_directory)
return make_error_code(llvm::errc::no_such_file_or_directory);
Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=192169&r1=192168&r2=192169&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Tue Oct 8 00:23:03 2013
@@ -69,7 +69,7 @@ public:
} // namespace
-llvm::ErrorOr<StringRef> ELFFileNode::path(const LinkingContext &) const {
+llvm::ErrorOr<StringRef> ELFFileNode::getPath(const LinkingContext &) const {
if (!_isDashlPrefix)
return _path;
return _elfLinkingContext.searchLibrary(_path, _libraryPaths);
More information about the llvm-commits
mailing list