summaryrefslogtreecommitdiff
path: root/libgfortran/intrinsics/transpose_generic.c
diff options
context:
space:
mode:
Diffstat (limited to 'libgfortran/intrinsics/transpose_generic.c')
-rw-r--r--libgfortran/intrinsics/transpose_generic.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libgfortran/intrinsics/transpose_generic.c b/libgfortran/intrinsics/transpose_generic.c
index b0c2fff5719..03fbbef24ed 100644
--- a/libgfortran/intrinsics/transpose_generic.c
+++ b/libgfortran/intrinsics/transpose_generic.c
@@ -1,8 +1,8 @@
/* Implementation of the TRANSPOSE intrinsic
- Copyright 2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+ Copyright 2003, 2006, 2007, 2009, 2012 Free Software Foundation, Inc.
Contributed by Tobias Schlüter
-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
@@ -50,7 +50,7 @@ transpose_internal (gfc_array_char *ret, gfc_array_char *source)
size = GFC_DESCRIPTOR_SIZE(ret);
- if (ret->data == NULL)
+ if (ret->base_addr == NULL)
{
assert (ret->dtype == source->dtype);
@@ -60,7 +60,7 @@ transpose_internal (gfc_array_char *ret, gfc_array_char *source)
GFC_DIMENSION_SET(ret->dim[1], 0, GFC_DESCRIPTOR_EXTENT(source,0) - 1,
GFC_DESCRIPTOR_EXTENT(source, 1));
- ret->data = internal_malloc_size (size * size0 ((array_t*)ret));
+ ret->base_addr = internal_malloc_size (size * size0 ((array_t*)ret));
ret->offset = 0;
}
else if (unlikely (compile_options.bounds_check))
@@ -95,8 +95,8 @@ transpose_internal (gfc_array_char *ret, gfc_array_char *source)
rxstride = GFC_DESCRIPTOR_STRIDE_BYTES(ret,0);
rystride = GFC_DESCRIPTOR_STRIDE_BYTES(ret,1);
- rptr = ret->data;
- sptr = source->data;
+ rptr = ret->base_addr;
+ sptr = source->base_addr;
for (y = 0; y < ycount; y++)
{