diff options
author | Ted Kremenek <kremenek@apple.com> | 2010-02-12 23:31:14 +0000 |
---|---|---|
committer | Ted Kremenek <kremenek@apple.com> | 2010-02-12 23:31:14 +0000 |
commit | 974be4d50a95317a85b111855946f5aa4bd15887 (patch) | |
tree | 5d60dd9e2939e23f37b9265d235cec34eef2182c | |
parent | a2a9d6e4e5b6001b86b7dfc5db1ea296ce29a3d3 (diff) |
Fix bug I introduced with assinging a temporary to a StringRef.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96041 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Basic/Version.cpp | 2 | ||||
-rw-r--r-- | lib/Frontend/PCHReader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp index 0c81fdd075..434ddf3f57 100644 --- a/lib/Basic/Version.cpp +++ b/lib/Basic/Version.cpp @@ -55,7 +55,7 @@ std::string getClangFullRepositoryVersion() { std::string buf; llvm::raw_string_ostream OS(buf); OS << getClangRepositoryPath(); - llvm::StringRef Revision = getClangRevision(); + const std::string &Revision = getClangRevision(); if (!Revision.empty()) OS << ' ' << Revision; return buf; diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index f6f4a78c13..a878df7840 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1414,9 +1414,9 @@ PCHReader::ReadPCHBlock() { break; case pch::VERSION_CONTROL_BRANCH_REVISION: { - llvm::StringRef CurBranch = getClangFullRepositoryVersion(); + const std::string &CurBranch = getClangFullRepositoryVersion(); llvm::StringRef PCHBranch(BlobStart, BlobLen); - if (CurBranch != PCHBranch) { + if (llvm::StringRef(CurBranch) != PCHBranch) { Diag(diag::warn_pch_different_branch) << PCHBranch << CurBranch; return IgnorePCH; } |