This is the mail archive of the
fortran@gcc.gnu.org
mailing list for the GNU Fortran project.
Re: Trunk merged into fortran-exp branch
- From: Jerry DeLisle <jvdelisle at verizon dot net>
- To: Dominique Dhumieres <dominiq at lps dot ens dot fr>
- Cc: fortran at gcc dot gnu dot org
- Date: Tue, 26 Jan 2010 06:40:46 -0800
- Subject: Re: Trunk merged into fortran-exp branch
- References: <20100126140728.9E9043BE85@mailhost.lps.ens.fr>
On 01/26/2010 06:07 AM, Dominique Dhumieres wrote:
Jerry,
After some fixing of conflicts due to the new style of constructors
I have successfully merged trunk into fortran-exp branch.
Bootstapping fortran-dev at revision 156232 failed with:
...
cc1: warnings being treated as errors
../../cons_clean/gcc/fortran/symbol.c: In function 'gen_special_c_interop_ptr':
../../cons_clean/gcc/fortran/symbol.c:3690:3: error: passing argument 1 of 'gfc_constructor_append_expr' from incompatible pointer type
../../cons_clean/gcc/fortran/constructor.h:46:18: note: expected 'struct splay_tree_s **' but argument is of type 'struct gfc_constructor **'
make[3]: *** [fortran/symbol.o] Error 1
...
TIA
Dominique
My svn status shows no modification. If you had a previous patch in there
before updating you could get this error. This is one of the spots that I had
to manually merge. It should look like this:
tmp_sym->value->ts.type = BT_DERIVED;
tmp_sym->value->ts.u.derived = tmp_sym->ts.u.derived;
c = gfc_constructor_first (tmp_sym->value->value.constructor);
gfc_constructor_append_expr (&c, NULL, NULL);
c->expr = gfc_get_expr ();
c->expr->expr_type = EXPR_NULL;
c->expr->ts.is_iso_c = 1;
/* Must declare c_null_ptr and c_null_funptr as having the
PARAMETER attribute so they can be used in init expressions. */
tmp_sym->attr.flavor = FL_PARAMETER;
return SUCCESS;
Regards,
Jerry