diff mbox

[Fortran-CAF,Fortran-DEV] Merge from the trunk into the branch

Message ID 5397F1A6.2010401@net-b.de
State New
Headers show

Commit Message

Tobias Burnus June 11, 2014, 6:05 a.m. UTC 
Tobias Burnus wrote:
> I have merged the trunk into the Fortran-caf branch (as Rev. 211423) 
> and into the Fortran-dev branch (as Rev. 211427).

For fortran-dev, I had to fix a merge fallout, see attachment (committed 
as Rev. 211435).

Tobias
diff mbox

Patch

Index: trans-openmp.c
===================================================================
--- trans-openmp.c	(Revision 211427)
+++ trans-openmp.c	(Arbeitskopie)
@@ -1090,7 +1090,7 @@  gfc_trans_omp_udr_expr (gfc_omp_namelist *n, bool
   /* Enable loop reversal.  */
   for (i = 0; i < GFC_MAX_DIMENSIONS; i++)
     loop.reverse[i] = GFC_ENABLE_REVERSE;
-  gfc_conv_loop_setup (&loop, &ns->code->loc);
+  gfc_conv_loop_setup (&loop, &ns->code->loc, &syme->ts);
   gfc_copy_loopinfo_to_se (&symse, &loop);
   gfc_copy_loopinfo_to_se (&outerse, &loop);
   symse.ss = symss;