_Bool is not a keyword in C++. Fixes PR7388 and PR8349.

llvm-svn: 116422
This commit is contained in:
Douglas Gregor
2010-10-13 20:00:38 +00:00
parent 1e7db68774
commit f10c97f36e
3 changed files with 9 additions and 3 deletions

View File

@@ -73,7 +73,7 @@ namespace {
KEYMS = 32,
BOOLSUPPORT = 64,
KEYALTIVEC = 128,
KEYNOMS = 256,
KEYNOCXX = 256,
KEYBORLAND = 512
};
}
@@ -99,7 +99,7 @@ static void AddKeyword(llvm::StringRef Keyword,
else if (LangOpts.Borland && (Flags & KEYBORLAND)) AddResult = 1;
else if (LangOpts.Bool && (Flags & BOOLSUPPORT)) AddResult = 2;
else if (LangOpts.AltiVec && (Flags & KEYALTIVEC)) AddResult = 2;
else if (!LangOpts.Microsoft && (Flags & KEYNOMS)) AddResult = 2;
else if (!LangOpts.CPlusPlus && (Flags & KEYNOCXX)) AddResult = 2;
// Don't add this keyword if disabled in this language.
if (AddResult == 0) return;