diff options
author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2010-10-19 01:28:50 +0000 |
---|---|---|
committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2010-10-19 01:28:50 +0000 |
commit | a11930ba8d19cc26848dc06d4a2571642af735b9 (patch) | |
tree | 57b515208fe72f75dd40e6e639f1fde700dcf61a /libgfortran/intrinsics | |
parent | 21016e43e2ead79d6dec8827a8c66339f467813b (diff) | |
download | gcc-a11930ba8d19cc26848dc06d4a2571642af735b9.zip gcc-a11930ba8d19cc26848dc06d4a2571642af735b9.tar.gz gcc-a11930ba8d19cc26848dc06d4a2571642af735b9.tar.bz2 |
io.h: Remove definition of the BT enumerator.
2010-10-18 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* io/io.h: Remove definition of the BT enumerator.
* libgfortran.h: Replace GFC_DTYPE enumerator with BT.
* intrinsics/iso_c_generated_procs.c: Likewise
* intrinsics/date_and_time.c: Likewise.
* intrinsics/iso_c_binding.c: Likewise.
* io/list_read.c: Likewise.
* io/transfer.c: Likewise.
* io/write.c: Likewise.
2010-10-18 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* gfortran.h: Remove definition of bt enumerator.
* libgfortran.h: Add bt enumerator type alighned with defintion.
Remove the dtype enumerator, no longer used.
previously given in libgfortran/io.h
* trans-types.c: Use new bt enumerator.
* trans-io.c: Likewise.
From-SVN: r165675
Diffstat (limited to 'libgfortran/intrinsics')
-rw-r--r-- | libgfortran/intrinsics/date_and_time.c | 2 | ||||
-rw-r--r-- | libgfortran/intrinsics/iso_c_binding.c | 4 | ||||
-rw-r--r-- | libgfortran/intrinsics/iso_c_generated_procs.c | 36 |
3 files changed, 21 insertions, 21 deletions
diff --git a/libgfortran/intrinsics/date_and_time.c b/libgfortran/intrinsics/date_and_time.c index 2ee8e5c..dea835b 100644 --- a/libgfortran/intrinsics/date_and_time.c +++ b/libgfortran/intrinsics/date_and_time.c @@ -349,7 +349,7 @@ secnds (GFC_REAL_4 *x) /* Make the INTEGER*4 array for passing to date_and_time. */ gfc_array_i4 *avalues = internal_malloc_size (sizeof (gfc_array_i4)); avalues->data = &values[0]; - GFC_DESCRIPTOR_DTYPE (avalues) = ((GFC_DTYPE_REAL << GFC_DTYPE_TYPE_SHIFT) + GFC_DESCRIPTOR_DTYPE (avalues) = ((BT_REAL << GFC_DTYPE_TYPE_SHIFT) & GFC_DTYPE_TYPE_MASK) + (4 << GFC_DTYPE_SIZE_SHIFT); diff --git a/libgfortran/intrinsics/iso_c_binding.c b/libgfortran/intrinsics/iso_c_binding.c index d0549b0..5baa14c 100644 --- a/libgfortran/intrinsics/iso_c_binding.c +++ b/libgfortran/intrinsics/iso_c_binding.c @@ -65,7 +65,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer) (void *c_ptr_in, /* Put in the element size. */ f_ptr_out->dtype = f_ptr_out->dtype | (elemSize << GFC_DTYPE_SIZE_SHIFT); - /* Set the data type (e.g., GFC_DTYPE_INTEGER). */ + /* Set the data type (e.g., BT_INTEGER). */ f_ptr_out->dtype = f_ptr_out->dtype | (type << GFC_DTYPE_TYPE_SHIFT); } @@ -184,6 +184,6 @@ ISO_C_BINDING_PREFIX (c_f_pointer_d0) (void *c_ptr_in, { f_ptr_out->dtype = f_ptr_out->dtype & (~GFC_DTYPE_TYPE_MASK); f_ptr_out->dtype = f_ptr_out->dtype - | (GFC_DTYPE_DERIVED << GFC_DTYPE_TYPE_SHIFT); + | (BT_DERIVED << GFC_DTYPE_TYPE_SHIFT); } } diff --git a/libgfortran/intrinsics/iso_c_generated_procs.c b/libgfortran/intrinsics/iso_c_generated_procs.c index e5ef7e1..7172858 100644 --- a/libgfortran/intrinsics/iso_c_generated_procs.c +++ b/libgfortran/intrinsics/iso_c_generated_procs.c @@ -139,7 +139,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_i1) (void *c_ptr_in, { /* Here we have an integer(kind=1). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_INTEGER, + (int) BT_INTEGER, (int) sizeof (GFC_INTEGER_1)); } #endif @@ -162,7 +162,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_i2) (void *c_ptr_in, { /* Here we have an integer(kind=2). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_INTEGER, + (int) BT_INTEGER, (int) sizeof (GFC_INTEGER_2)); } #endif @@ -181,7 +181,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_i4) (void *c_ptr_in, { /* Here we have an integer(kind=4). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_INTEGER, + (int) BT_INTEGER, (int) sizeof (GFC_INTEGER_4)); } #endif @@ -200,7 +200,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_i8) (void *c_ptr_in, { /* Here we have an integer(kind=8). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_INTEGER, + (int) BT_INTEGER, (int) sizeof (GFC_INTEGER_8)); } #endif @@ -223,7 +223,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_i16) (void *c_ptr_in, { /* Here we have an integer(kind=16). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_INTEGER, + (int) BT_INTEGER, (int) sizeof (GFC_INTEGER_16)); } #endif @@ -242,7 +242,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_r4) (void *c_ptr_in, { /* Here we have an real(kind=4). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_REAL, + (int) BT_REAL, (int) sizeof (GFC_REAL_4)); } #endif @@ -261,7 +261,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_r8) (void *c_ptr_in, { /* Here we have an real(kind=8). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_REAL, + (int) BT_REAL, (int) sizeof (GFC_REAL_8)); } #endif @@ -280,7 +280,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_r10) (void *c_ptr_in, { /* Here we have an real(kind=10). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_REAL, + (int) BT_REAL, (int) sizeof (GFC_REAL_10)); } #endif @@ -299,7 +299,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_r16) (void *c_ptr_in, { /* Here we have an real(kind=16). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_REAL, + (int) BT_REAL, (int) sizeof (GFC_REAL_16)); } #endif @@ -318,7 +318,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_c4) (void *c_ptr_in, { /* Here we have an complex(kind=4). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_COMPLEX, + (int) BT_COMPLEX, (int) sizeof (GFC_COMPLEX_4)); } #endif @@ -337,7 +337,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_c8) (void *c_ptr_in, { /* Here we have an complex(kind=8). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_COMPLEX, + (int) BT_COMPLEX, (int) sizeof (GFC_COMPLEX_8)); } #endif @@ -356,7 +356,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_c10) (void *c_ptr_in, { /* Here we have an complex(kind=10). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_COMPLEX, + (int) BT_COMPLEX, (int) sizeof (GFC_COMPLEX_10)); } #endif @@ -375,7 +375,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_c16) (void *c_ptr_in, { /* Here we have an complex(kind=16). */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_COMPLEX, + (int) BT_COMPLEX, (int) sizeof (GFC_COMPLEX_16)); } #endif @@ -392,7 +392,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_s0) (void *c_ptr_in, { /* Here we have a character string of len=1. */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_CHARACTER, + (int) BT_CHARACTER, (int) sizeof (char)); } #endif @@ -409,7 +409,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_l1) (void *c_ptr_in, { /* Here we have a logical of kind=1. */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_LOGICAL, + (int) BT_LOGICAL, (int) sizeof (GFC_LOGICAL_1)); } #endif @@ -426,7 +426,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_l2) (void *c_ptr_in, { /* Here we have a logical of kind=2. */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_LOGICAL, + (int) BT_LOGICAL, (int) sizeof (GFC_LOGICAL_2)); } #endif @@ -443,7 +443,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_l4) (void *c_ptr_in, { /* Here we have a logical of kind=4. */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_LOGICAL, + (int) BT_LOGICAL, (int) sizeof (GFC_LOGICAL_4)); } #endif @@ -460,7 +460,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_l8) (void *c_ptr_in, { /* Here we have a logical of kind=8. */ ISO_C_BINDING_PREFIX (c_f_pointer) (c_ptr_in, f_ptr_out, shape, - (int) GFC_DTYPE_LOGICAL, + (int) BT_LOGICAL, (int) sizeof (GFC_LOGICAL_8)); } #endif |