diff options
| author | Jason Merrill <jason@redhat.com> | 2008-07-15 01:11:18 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2008-07-15 01:11:18 -0400 |
| commit | 7ce841d2c832b46c5b72518715c41ba91cde344f (patch) | |
| tree | 6d95d58f2305c07874a90ab3c4ae06cfbbe1e6a8 /gcc/cp/lex.c | |
| parent | 6926c71318e0de2ffe0e4d0e24f0204e53806250 (diff) | |
| download | gcc-7ce841d2c832b46c5b72518715c41ba91cde344f.zip gcc-7ce841d2c832b46c5b72518715c41ba91cde344f.tar.gz gcc-7ce841d2c832b46c5b72518715c41ba91cde344f.tar.bz2 | |
re PR objc++/36723 (massive obj-c++ failures at rev.137407)
PR objc++/36723
* objc/objc-act.c (objc_build_constructor): Update C++ tweak.
* cp/lex.c (init_reswords): Always set D_OBJC.
From-SVN: r137813
Diffstat (limited to 'gcc/cp/lex.c')
| -rw-r--r-- | gcc/cp/lex.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 890640e..ee2f2a8 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -179,8 +179,9 @@ init_reswords (void) mask |= D_ASM | D_EXT; if (flag_no_gnu_keywords) mask |= D_EXT; - if (!c_dialect_objc()) - mask |= D_OBJC; + + /* The Objective-C keywords are all context-dependent. */ + mask |= D_OBJC; ridpointers = GGC_CNEWVEC (tree, (int) RID_MAX); for (i = 0; i < num_c_common_reswords; i++) |