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 | 8bd0929d410e232f9465a7ceaa63f6191dd9d71c (patch) | |
| tree | 2247c8df610edf5dad3a12da1ae5ca3802f5130b /clang/lib | |
| parent | 1e827fd8caf27c1a18a13362d7ba0a3fc16a145d (diff) | |
| download | llvm-8bd0929d410e232f9465a7ceaa63f6191dd9d71c.zip llvm-8bd0929d410e232f9465a7ceaa63f6191dd9d71c.tar.gz llvm-8bd0929d410e232f9465a7ceaa63f6191dd9d71c.tar.bz2 | |
Fix bug I introduced with assinging a temporary to a StringRef.
llvm-svn: 96041
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Basic/Version.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/PCHReader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp index 0c81fdd..434ddf3 100644 --- a/clang/lib/Basic/Version.cpp +++ b/clang/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/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp index f6f4a78..a878df7 100644 --- a/clang/lib/Frontend/PCHReader.cpp +++ b/clang/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; } |