diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-04-02 08:55:10 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-04-02 08:55:10 +0000 |
| commit | 07b2cfcdb817cc0790420f159a313d61e7241cb9 (patch) | |
| tree | d374cdca417e76f1bf101f139dba2db1d10ee8f7 /lib/Lex/TokenConcatenation.cpp | |
| parent | 1e255aab650a7fa2047fd953cae65b12215280af (diff) | |
| download | FreeBSD-src-07b2cfcdb817cc0790420f159a313d61e7241cb9.zip FreeBSD-src-07b2cfcdb817cc0790420f159a313d61e7241cb9.tar.gz | |
Update clang to r100181.
Diffstat (limited to 'lib/Lex/TokenConcatenation.cpp')
| -rw-r--r-- | lib/Lex/TokenConcatenation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Lex/TokenConcatenation.cpp b/lib/Lex/TokenConcatenation.cpp index 0795164..51d2e23 100644 --- a/lib/Lex/TokenConcatenation.cpp +++ b/lib/Lex/TokenConcatenation.cpp @@ -85,7 +85,7 @@ TokenConcatenation::TokenConcatenation(Preprocessor &pp) : PP(pp) { TokenInfo[tok::star ] |= aci_avoid_equal; // *= TokenInfo[tok::exclaim ] |= aci_avoid_equal; // != TokenInfo[tok::lessless ] |= aci_avoid_equal; // <<= - TokenInfo[tok::greaterequal] |= aci_avoid_equal; // >>= + TokenInfo[tok::greatergreater] |= aci_avoid_equal; // >>= TokenInfo[tok::caret ] |= aci_avoid_equal; // ^= TokenInfo[tok::equal ] |= aci_avoid_equal; // == } |
