diff options
| -rw-r--r-- | include/clang/Frontend/PCHBitCodes.h | 8 | ||||
| -rw-r--r-- | lib/Frontend/PCHReader.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/PCHWriter.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/clang/Frontend/PCHBitCodes.h b/include/clang/Frontend/PCHBitCodes.h index d9d74dcdc4..1a9f4ceab9 100644 --- a/include/clang/Frontend/PCHBitCodes.h +++ b/include/clang/Frontend/PCHBitCodes.h @@ -30,7 +30,7 @@ namespace clang { /// designed for the previous version could not support reading /// the new version), this number should be increased. /// - /// Version 3 of PCH files also requires that the Subversion branch and + /// Version 3 of PCH files also requires that the version control branch and /// revision match exactly, since there is no backward compatibility of /// PCH files at this time. const unsigned VERSION_MAJOR = 3; @@ -219,9 +219,9 @@ namespace clang { /// comments were encountered in the source code. COMMENT_RANGES = 20, - /// \brief Record code for the Subversion branch and revision information - /// of the compiler used to build this PCH file. - SVN_BRANCH_REVISION = 21 + /// \brief Record code for the version control branch and revision + /// information of the compiler used to build this PCH file. + VERSION_CONTROL_BRANCH_REVISION = 21 }; /// \brief Record types used within a source manager block. diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index 4114b8b95d..cc738e6fb9 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -1399,7 +1399,7 @@ PCHReader::ReadPCHBlock() { NumComments = BlobLen / sizeof(SourceRange); break; - case pch::SVN_BRANCH_REVISION: { + case pch::VERSION_CONTROL_BRANCH_REVISION: { unsigned CurRevision = getClangSubversionRevision(); if (Record[0] && CurRevision && Record[0] != CurRevision) { Diag(Record[0] < CurRevision? diag::warn_pch_version_too_old diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp index caaf880df8..d1aa1d8b50 100644 --- a/lib/Frontend/PCHWriter.cpp +++ b/lib/Frontend/PCHWriter.cpp @@ -543,7 +543,7 @@ void PCHWriter::WriteBlockInfoBlock() { RECORD(STAT_CACHE); RECORD(EXT_VECTOR_DECLS); RECORD(COMMENT_RANGES); - RECORD(SVN_BRANCH_REVISION); + RECORD(VERSION_CONTROL_BRANCH_REVISION); // SourceManager Block. BLOCK(SOURCE_MANAGER_BLOCK); @@ -709,12 +709,12 @@ void PCHWriter::WriteMetadata(ASTContext &Context, const char *isysroot) { // Subversion branch/version information. BitCodeAbbrev *SvnAbbrev = new BitCodeAbbrev(); - SvnAbbrev->Add(BitCodeAbbrevOp(pch::SVN_BRANCH_REVISION)); + SvnAbbrev->Add(BitCodeAbbrevOp(pch::VERSION_CONTROL_BRANCH_REVISION)); SvnAbbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // SVN revision SvnAbbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Blob)); // SVN branch/tag unsigned SvnAbbrevCode = Stream.EmitAbbrev(SvnAbbrev); Record.clear(); - Record.push_back(pch::SVN_BRANCH_REVISION); + Record.push_back(pch::VERSION_CONTROL_BRANCH_REVISION); Record.push_back(getClangSubversionRevision()); Stream.EmitRecordWithBlob(SvnAbbrevCode, Record, getClangRepositoryPath()); } |