Use a more conventional logical op instead of bitwise and

llvm-svn: 202006
This commit is contained in:
Alp Toker 2014-02-24 04:35:58 +00:00
parent 7a0b640dfa
commit 7d2fea2fd6
1 changed files with 1 additions and 1 deletions

View File

@ -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);