diff options
| author | Alp Toker <alp@nuanti.com> | 2014-02-24 04:35:58 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-02-24 04:35:58 +0000 |
| commit | 7d2fea2fd6903f91cdd1dd88e998b3955493b3ea (patch) | |
| tree | 7b225d6064ab1a0c6ffbf8464c0a72537a5350f3 /clang/lib | |
| parent | 7a0b640dfa05b9d00746973277bac1fd4cb5b531 (diff) | |
| download | bcm5719-llvm-7d2fea2fd6903f91cdd1dd88e998b3955493b3ea.tar.gz bcm5719-llvm-7d2fea2fd6903f91cdd1dd88e998b3955493b3ea.zip | |
Use a more conventional logical op instead of bitwise and
llvm-svn: 202006
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Lex/Preprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 1e54ab37251..e7d844087c0 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/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); |
