From f10c97f36e0e367d654a8f8df5e14c3d524e1a40 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Wed, 13 Oct 2010 20:00:38 +0000
Subject: _Bool is not a keyword in C++. Fixes PR7388 and PR8349.

llvm-svn: 116422
---
 clang/lib/Basic/IdentifierTable.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'clang/lib/Basic/IdentifierTable.cpp')

diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 6b673e39d36..bd30c68da2b 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -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;
-- 
cgit v1.2.3