Allow compilation with GCC 4.4.
include/ * obstack.h: Update to GCC 3.3 version. gcc/cp/ * decl.c (current_binding_level): Add *&. * parse.y (constructor_declarator): Fix for bison pedantry. (nomods_initdcl0): Likewise. From-SVN: r159946
This commit is contained in:
Jason Merrill
Jason Merrill
parent
1434f6516a
commit
e5e16ea3ff
|
|
@ -1,3 +1,9 @@
|
|||
2010-05-27 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* decl.c (current_binding_level): Add *&.
|
||||
* parse.y (constructor_declarator): Fix for bison pedantry.
|
||||
(nomods_initdcl0): Likewise.
|
||||
|
||||
2002-06-19 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* parse.y (TYPENAME): Rename as tTYPENAME to avoid the clash with
|
||||
|
|
|
|||
|
|
@ -478,9 +478,9 @@ struct binding_level
|
|||
/* The binding level currently in effect. */
|
||||
|
||||
#define current_binding_level \
|
||||
(cfun && cp_function_chain->bindings \
|
||||
? cp_function_chain->bindings \
|
||||
: scope_chain->bindings)
|
||||
(*(cfun && cp_function_chain->bindings \
|
||||
? &cp_function_chain->bindings \
|
||||
: &scope_chain->bindings))
|
||||
|
||||
/* The binding level of the current class, if any. */
|
||||
|
||||
|
|
|
|||
|
|
@ -765,7 +765,7 @@ fndef:
|
|||
|
||||
constructor_declarator:
|
||||
nested_name_specifier SELFNAME '('
|
||||
{ $$ = begin_constructor_declarator ($1, $2); }
|
||||
{ $<ttype>$ = begin_constructor_declarator ($1, $2); }
|
||||
parmlist ')' cv_qualifiers exception_specification_opt
|
||||
{ $$ = make_call_declarator ($<ttype>4, $5, $7, $8); }
|
||||
| nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt
|
||||
|
|
@ -773,7 +773,7 @@ constructor_declarator:
|
|||
$$ = make_call_declarator ($$, empty_parms (), $4, $5);
|
||||
}
|
||||
| global_scope nested_name_specifier SELFNAME '('
|
||||
{ $$ = begin_constructor_declarator ($2, $3); }
|
||||
{ $<ttype>$ = begin_constructor_declarator ($2, $3); }
|
||||
parmlist ')' cv_qualifiers exception_specification_opt
|
||||
{ $$ = make_call_declarator ($<ttype>5, $6, $8, $9); }
|
||||
| global_scope nested_name_specifier SELFNAME LEFT_RIGHT cv_qualifiers exception_specification_opt
|
||||
|
|
@ -781,7 +781,7 @@ constructor_declarator:
|
|||
$$ = make_call_declarator ($$, empty_parms (), $5, $6);
|
||||
}
|
||||
| nested_name_specifier self_template_type '('
|
||||
{ $$ = begin_constructor_declarator ($1, $2); }
|
||||
{ $<ttype>$ = begin_constructor_declarator ($1, $2); }
|
||||
parmlist ')' cv_qualifiers exception_specification_opt
|
||||
{ $$ = make_call_declarator ($<ttype>4, $5, $7, $8); }
|
||||
| nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt
|
||||
|
|
@ -789,7 +789,7 @@ constructor_declarator:
|
|||
$$ = make_call_declarator ($$, empty_parms (), $4, $5);
|
||||
}
|
||||
| global_scope nested_name_specifier self_template_type '('
|
||||
{ $$ = begin_constructor_declarator ($2, $3); }
|
||||
{ $<ttype>$ = begin_constructor_declarator ($2, $3); }
|
||||
parmlist ')' cv_qualifiers exception_specification_opt
|
||||
{ $$ = make_call_declarator ($<ttype>5, $6, $8, $9); }
|
||||
| global_scope nested_name_specifier self_template_type LEFT_RIGHT cv_qualifiers exception_specification_opt
|
||||
|
|
@ -2080,7 +2080,7 @@ notype_initdcl0:
|
|||
nomods_initdcl0:
|
||||
notype_declarator maybeasm
|
||||
{ /* Set things up as initdcl0_innards expects. */
|
||||
$<ttype>3 = $2;
|
||||
$<ttype>$ = $2;
|
||||
$2 = $1;
|
||||
$<ftype>1.t = NULL_TREE;
|
||||
$<ftype>1.lookups = NULL_TREE; }
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2010-05-27 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* obstack.h: Update to GCC 3.3 version.
|
||||
|
||||
2002-02-20 Release Manager
|
||||
|
||||
* GCC 3.0.4 Released.
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ extern int obstack_exit_failure;
|
|||
|
||||
#endif
|
||||
|
||||
#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar)
|
||||
#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
|
||||
|
||||
#define obstack_blank_fast(h,n) ((h)->next_free += (n))
|
||||
|
||||
|
|
@ -410,7 +410,7 @@ __extension__ \
|
|||
({ struct obstack *__o = (OBSTACK); \
|
||||
if (__o->next_free + 1 > __o->chunk_limit) \
|
||||
_obstack_newchunk (__o, 1); \
|
||||
*(__o->next_free)++ = (datum); \
|
||||
obstack_1grow_fast (__o, datum); \
|
||||
(void) 0; })
|
||||
|
||||
/* These assume that the obstack alignment is good enough for pointers or ints,
|
||||
|
|
@ -422,19 +422,28 @@ __extension__ \
|
|||
({ struct obstack *__o = (OBSTACK); \
|
||||
if (__o->next_free + sizeof (void *) > __o->chunk_limit) \
|
||||
_obstack_newchunk (__o, sizeof (void *)); \
|
||||
*((void **)__o->next_free)++ = ((void *)datum); \
|
||||
(void) 0; })
|
||||
obstack_ptr_grow_fast (__o, datum); })
|
||||
|
||||
# define obstack_int_grow(OBSTACK,datum) \
|
||||
__extension__ \
|
||||
({ struct obstack *__o = (OBSTACK); \
|
||||
if (__o->next_free + sizeof (int) > __o->chunk_limit) \
|
||||
_obstack_newchunk (__o, sizeof (int)); \
|
||||
*((int *)__o->next_free)++ = ((int)datum); \
|
||||
obstack_int_grow_fast (__o, datum); })
|
||||
|
||||
# define obstack_ptr_grow_fast(OBSTACK,aptr) \
|
||||
__extension__ \
|
||||
({ struct obstack *__o1 = (OBSTACK); \
|
||||
*(const void **) __o1->next_free = (aptr); \
|
||||
__o1->next_free += sizeof (const void *); \
|
||||
(void) 0; })
|
||||
|
||||
# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
|
||||
# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
|
||||
# define obstack_int_grow_fast(OBSTACK,aint) \
|
||||
__extension__ \
|
||||
({ struct obstack *__o1 = (OBSTACK); \
|
||||
*(int *) __o1->next_free = (aint); \
|
||||
__o1->next_free += sizeof (int); \
|
||||
(void) 0; })
|
||||
|
||||
# define obstack_blank(OBSTACK,length) \
|
||||
__extension__ \
|
||||
|
|
@ -442,7 +451,7 @@ __extension__ \
|
|||
int __len = (length); \
|
||||
if (__o->chunk_limit - __o->next_free < __len) \
|
||||
_obstack_newchunk (__o, __len); \
|
||||
__o->next_free += __len; \
|
||||
obstack_blank_fast (__o, __len); \
|
||||
(void) 0; })
|
||||
|
||||
# define obstack_alloc(OBSTACK,length) \
|
||||
|
|
@ -529,26 +538,29 @@ __extension__ \
|
|||
# define obstack_1grow(h,datum) \
|
||||
( (((h)->next_free + 1 > (h)->chunk_limit) \
|
||||
? (_obstack_newchunk ((h), 1), 0) : 0), \
|
||||
(*((h)->next_free)++ = (datum)))
|
||||
obstack_1grow_fast (h, datum))
|
||||
|
||||
# define obstack_ptr_grow(h,datum) \
|
||||
( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \
|
||||
? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \
|
||||
(*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum)))
|
||||
obstack_ptr_grow_fast (h, datum))
|
||||
|
||||
# define obstack_int_grow(h,datum) \
|
||||
( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \
|
||||
? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \
|
||||
(*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum)))
|
||||
obstack_int_grow_fast (h, datum))
|
||||
|
||||
# define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr)
|
||||
# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
|
||||
# define obstack_ptr_grow_fast(h,aptr) \
|
||||
(((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
|
||||
|
||||
# define obstack_int_grow_fast(h,aint) \
|
||||
(((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr))
|
||||
|
||||
# define obstack_blank(h,length) \
|
||||
( (h)->temp = (length), \
|
||||
(((h)->chunk_limit - (h)->next_free < (h)->temp) \
|
||||
? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \
|
||||
((h)->next_free += (h)->temp))
|
||||
obstack_blank_fast (h, (h)->temp))
|
||||
|
||||
# define obstack_alloc(h,length) \
|
||||
(obstack_blank ((h), (length)), obstack_finish ((h)))
|
||||
|
|
|
|||
Loading…
Reference in New Issue