summaryrefslogtreecommitdiff
path: root/libgfortran/m4/shape.m4
diff options
context:
space:
mode:
Diffstat (limited to 'libgfortran/m4/shape.m4')
-rw-r--r--libgfortran/m4/shape.m410
1 files changed, 5 insertions, 5 deletions
diff --git a/libgfortran/m4/shape.m4 b/libgfortran/m4/shape.m4
index c079cca9903..66445ce8301 100644
--- a/libgfortran/m4/shape.m4
+++ b/libgfortran/m4/shape.m4
@@ -1,8 +1,8 @@
`/* Implementation of the SHAPE intrinsic
- Copyright 2002, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ Copyright 2002, 2006, 2007, 2009, 2010, 2012 Free Software Foundation, Inc.
Contributed by Paul Brook <paul@nowt.org>
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
Libgfortran is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -46,11 +46,11 @@ shape_'rtype_kind` ('rtype` * const restrict ret,
rank = GFC_DESCRIPTOR_RANK (array);
- if (ret->data == NULL)
+ if (ret->base_addr == NULL)
{
GFC_DIMENSION_SET(ret->dim[0], 0, rank - 1, 1);
ret->offset = 0;
- ret->data = internal_malloc_size (sizeof ('rtype_name`) * rank);
+ ret->base_addr = internal_malloc_size (sizeof ('rtype_name`) * rank);
}
stride = GFC_DESCRIPTOR_STRIDE(ret,0);
@@ -61,7 +61,7 @@ shape_'rtype_kind` ('rtype` * const restrict ret,
for (n = 0; n < rank; n++)
{
extent = GFC_DESCRIPTOR_EXTENT(array,n);
- ret->data[n * stride] = extent > 0 ? extent : 0 ;
+ ret->base_addr[n * stride] = extent > 0 ? extent : 0 ;
}
}