diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-04-29 01:38:03 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-04-29 01:38:03 +0000 |
| commit | 63180b11909d989d07675c70a323a0ebff8dc697 (patch) | |
| tree | 2b73d9cbe72209caeae3a5a52855a82f0b20d053 /clang/lib/Parse/ParseDeclCXX.cpp | |
| parent | 68dac4676d3e3e63c65520e454c3b2bbf49940e2 (diff) | |
| download | bcm5719-llvm-63180b11909d989d07675c70a323a0ebff8dc697.tar.gz bcm5719-llvm-63180b11909d989d07675c70a323a0ebff8dc697.zip | |
libstdc++ 4.2 also uses __is_same as a struct name, which conflicts with our new type trait __is_same
llvm-svn: 130468
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 92cdfffdc08..30dc50077a7 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -738,7 +738,8 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind, Tok.is(tok::kw___is_pointer) || Tok.is(tok::kw___is_arithmetic) || Tok.is(tok::kw___is_fundamental) || - Tok.is(tok::kw___is_scalar))) { + Tok.is(tok::kw___is_scalar) || + Tok.is(tok::kw___is_same))) { // GNU libstdc++ 4.2 uses certain intrinsic names as the name of // struct templates, but these are keywords in GCC >= 4.3 and // Clang. Therefore, when we see the token sequence "struct X", make |
