diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-19 17:49:07 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-19 17:49:07 +0000 |
commit | 351a88f697363a2a6910602c1443f696a8c0b2eb (patch) | |
tree | 7b37142e403457384c034a32cbac929346771415 /llvm/tools/llvm-ar/llvm-ar.cpp | |
parent | 991f42c35f27209e01ebfea960d438863a9cf4bf (diff) | |
download | bcm5719-llvm-351a88f697363a2a6910602c1443f696a8c0b2eb.tar.gz bcm5719-llvm-351a88f697363a2a6910602c1443f696a8c0b2eb.zip |
Remove more uses of sys::Path.
llvm-svn: 184328
Diffstat (limited to 'llvm/tools/llvm-ar/llvm-ar.cpp')
-rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 27df8d83558..40615514114 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -552,7 +552,7 @@ doQuickAppend(std::string* ErrMsg) { // Append them quickly. for (std::set<std::string>::iterator PI = Paths.begin(), PE = Paths.end(); PI != PE; ++PI) { - if (TheArchive->addFileBefore(sys::Path(*PI),TheArchive->end(),ErrMsg)) + if (TheArchive->addFileBefore(*PI, TheArchive->end(), ErrMsg)) return true; } @@ -620,11 +620,11 @@ doReplaceOrInsert(std::string* ErrMsg) { if (OnlyUpdate) { // Replace the item only if it is newer. if (si->modTime > I->getModTime()) - if (I->replaceWith(sys::Path(*found), ErrMsg)) + if (I->replaceWith(*found, ErrMsg)) return true; } else { // Replace the item regardless of time stamp - if (I->replaceWith(sys::Path(*found), ErrMsg)) + if (I->replaceWith(*found, ErrMsg)) return true; } } else { @@ -649,7 +649,7 @@ doReplaceOrInsert(std::string* ErrMsg) { if (!remaining.empty()) { for (std::set<std::string>::iterator PI = remaining.begin(), PE = remaining.end(); PI != PE; ++PI) { - if (TheArchive->addFileBefore(sys::Path(*PI),insert_spot, ErrMsg)) + if (TheArchive->addFileBefore(*PI, insert_spot, ErrMsg)) return true; } } @@ -697,11 +697,11 @@ int main(int argc, char **argv) { // Produce a warning if we should and we're creating the archive if (!Create) errs() << argv[0] << ": creating " << ArchivePath.str() << "\n"; - TheArchive = Archive::CreateEmpty(ArchivePath, Context); + TheArchive = Archive::CreateEmpty(ArchivePath.str(), Context); TheArchive->writeToDisk(); } else { std::string Error; - TheArchive = Archive::OpenAndLoad(ArchivePath, Context, &Error); + TheArchive = Archive::OpenAndLoad(ArchivePath.str(), Context, &Error); if (TheArchive == 0) { errs() << argv[0] << ": error loading '" << ArchivePath.str() << "': " << Error << "!\n"; |