6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-23 14:25:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove more uses of sys::Path.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184328 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-06-19 17:49:07 +00:00
parent 80a6d6526c
commit 13f4fd77b9
5 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/llvm-ar/llvm-ar.cpp
View File

@@ -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";