diff options
author | Ted Kremenek <kremenek@apple.com> | 2010-01-22 20:55:35 +0000 |
---|---|---|
committer | Ted Kremenek <kremenek@apple.com> | 2010-01-22 20:55:35 +0000 |
commit | 517e676b9e1524e39beeb47718822f2647801d1a (patch) | |
tree | 0cca5f69805de64b3c83350e35c89f330cbf6d21 /lib/Frontend | |
parent | 9fb48de917e6646725d5bb01b6e2c5ec46ff75a1 (diff) |
Rename getClangSubversionPath() -> getClangRepositoryPath() and have it return a StringRef.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94213 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend')
-rw-r--r-- | lib/Frontend/PCHReader.cpp | 6 | ||||
-rw-r--r-- | lib/Frontend/PCHWriter.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index 77fa11e3e3..4114b8b95d 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1407,9 +1407,9 @@ PCHReader::ReadPCHBlock() { return IgnorePCH; } - const char *CurBranch = getClangSubversionPath(); - if (strncmp(CurBranch, BlobStart, BlobLen)) { - std::string PCHBranch(BlobStart, BlobLen); + llvm::StringRef CurBranch = getClangRepositoryPath(); + llvm::StringRef PCHBranch(BlobStart, BlobLen); + if (CurBranch != PCHBranch) { Diag(diag::warn_pch_different_branch) << PCHBranch << CurBranch; return IgnorePCH; } diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp index 29647f3b95..caaf880df8 100644 --- a/lib/Frontend/PCHWriter.cpp +++ b/lib/Frontend/PCHWriter.cpp @@ -716,7 +716,7 @@ void PCHWriter::WriteMetadata(ASTContext &Context, const char *isysroot) { Record.clear(); Record.push_back(pch::SVN_BRANCH_REVISION); Record.push_back(getClangSubversionRevision()); - Stream.EmitRecordWithBlob(SvnAbbrevCode, Record, getClangSubversionPath()); + Stream.EmitRecordWithBlob(SvnAbbrevCode, Record, getClangRepositoryPath()); } /// \brief Write the LangOptions structure. |