diff options
Diffstat (limited to 'libgfortran/m4/reshape.m4')
| -rw-r--r-- | libgfortran/m4/reshape.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4 index d1486f3942e..26ea7e0d875 100644 --- a/libgfortran/m4/reshape.m4 +++ b/libgfortran/m4/reshape.m4 @@ -1,8 +1,8 @@ `/* Implementation of the RESHAPE intrinsic - Copyright 2002, 2006, 2007, 2009 Free Software Foundation, Inc. + Copyright 2002, 2006, 2007, 2009, 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 @@ -91,7 +91,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, for (n = 0; n < rdim; n++) { - shape_data[n] = shape->data[n * GFC_DESCRIPTOR_STRIDE(shape,0)]; + shape_data[n] = shape->base_addr[n * GFC_DESCRIPTOR_STRIDE(shape,0)]; if (shape_data[n] <= 0) { shape_data[n] = 0; @@ -99,7 +99,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, } } - if (ret->data == NULL) + if (ret->base_addr == NULL) { index_type alloc_size; @@ -119,7 +119,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, else alloc_size = rs * sizeof ('rtype_name`); - ret->data = internal_malloc_size (alloc_size); + ret->base_addr = internal_malloc_size (alloc_size); ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim; } @@ -147,7 +147,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, else psize = 0; } - pptr = pad->data; + pptr = pad->base_addr; } else { @@ -197,7 +197,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, for (n = 0; n < rdim; n++) { - v = order->data[n * GFC_DESCRIPTOR_STRIDE(order,0)] - 1; + v = order->base_addr[n * GFC_DESCRIPTOR_STRIDE(order,0)] - 1; if (v < 0 || v >= rdim) runtime_error("Value %ld out of range in ORDER argument" @@ -216,7 +216,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, for (n = 0; n < rdim; n++) { if (order) - dim = order->data[n * GFC_DESCRIPTOR_STRIDE(order,0)] - 1; + dim = order->base_addr[n * GFC_DESCRIPTOR_STRIDE(order,0)] - 1; else dim = n; @@ -262,12 +262,12 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret, rsize *= sizeof ('rtype_name`); ssize *= sizeof ('rtype_name`); psize *= sizeof ('rtype_name`); - reshape_packed ((char *)ret->data, rsize, (char *)source->data, - ssize, pad ? (char *)pad->data : NULL, psize); + reshape_packed ((char *)ret->base_addr, rsize, (char *)source->base_addr, + ssize, pad ? (char *)pad->base_addr : NULL, psize); return; } - rptr = ret->data; - src = sptr = source->data; + rptr = ret->base_addr; + src = sptr = source->base_addr; rstride0 = rstride[0]; sstride0 = sstride[0]; |