From: Alp Toker <alp@nuanti.com>
Date: Mon, 24 Feb 2014 04:35:58 +0000 (+0000)
Subject: Use a more conventional logical op instead of bitwise and
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=270d39edd522164bf7f8e5f8c7e6dffca1c73664;p=clang

Use a more conventional logical op instead of bitwise and

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202006 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 1e54ab3725..e7d844087c 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -627,7 +627,7 @@ bool Preprocessor::HandleIdentifier(Token &Identifier) {
   // name of a macro.
   // FIXME: This warning is disabled in cases where it shouldn't be, like
   //   "#define constexpr constexpr", "int constexpr;"
-  if (II.isCXX11CompatKeyword() & !DisableMacroExpansion) {
+  if (II.isCXX11CompatKeyword() && !DisableMacroExpansion) {
     Diag(Identifier, diag::warn_cxx11_keyword) << II.getName();
     // Don't diagnose this keyword again in this translation unit.
     II.setIsCXX11CompatKeyword(false);