OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jason Merrill 2008-07-15 01:11:18 -04:00 committed by Jason Merrill
parent 6926c71318
commit 7ce841d2c8
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2008-07-14 Jason Merrill <jason@redhat.com>
* lex.c (init_reswords): Always set D_OBJC.
2008-07-11 Tom Tromey <tromey@redhat.com>
Ian Lance Taylor <iant@google.com>

5
gcc/cp/lex.c
View File

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

5
gcc/objc/ChangeLog
View File

@ -1,3 +1,8 @@
2008-07-14 Jason Merrill <jason@redhat.com>
PR objc++/36723
* objc-act.c (objc_build_constructor): Update C++ tweak.
2007-07-14 Rafael Avila de Espindola <espindola@google.com>
* objc-act.c (synth_module_prologue): Use TREE_NO_WARNING instead

3
gcc/objc/objc-act.c
View File

@ -2028,8 +2028,7 @@ objc_build_constructor (tree type, tree elts)
/* Adjust for impedance mismatch. We should figure out how to build
CONSTRUCTORs that consistently please both the C and C++ gods. */
if (!TREE_PURPOSE (elts))
TREE_TYPE (constructor) = NULL_TREE;
TREE_HAS_CONSTRUCTOR (constructor) = 1;
TREE_TYPE (constructor) = init_list_type_node;
#endif
return constructor;