summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2003-10-13 22:25:59 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2003-10-13 22:25:59 (GMT)
commit3aa8cd12237ee8ffec97c7b417b7cfe0e6fcb0d3 (patch)
treeccb464898646e5851d117dc7514a070a4e9f2c0c /fortran/src
parent8d5bcd338d2019fa37b60d267be49da9d324628d (diff)
downloadhdf5-3aa8cd12237ee8ffec97c7b417b7cfe0e6fcb0d3.zip
hdf5-3aa8cd12237ee8ffec97c7b417b7cfe0e6fcb0d3.tar.gz
hdf5-3aa8cd12237ee8ffec97c7b417b7cfe0e6fcb0d3.tar.bz2
[svn-r7621]
Purpose: Rolling over changes from 1.6 branch Description: h5pget(set)_cache_f functions had a wrong type of the third parameter Solution: Fixed the type to be INTEGER(SIZE_T) Platforms tested: kelgia, arabica 64-bit, copper 64-bit Misc. update:
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/H5Pf.c12
-rw-r--r--fortran/src/H5Pff.f908
-rw-r--r--fortran/src/H5f90proto.h4
3 files changed, 12 insertions, 12 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 616de60..6918e26 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -1094,13 +1094,13 @@ nh5pget_fapl_family_c(hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plist
* instead of double
*---------------------------------------------------------------------------*/
int_f
-nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_f* rdcc_nbytes , real_f* rdcc_w0 )
+nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes , real_f* rdcc_w0 )
{
int ret_value = -1;
hid_t c_prp_id;
herr_t ret;
int c_mdc_nelmts;
- int c_rdcc_nelmts;
+ size_t c_rdcc_nelmts;
size_t c_rdcc_nbytes;
double c_rdcc_w0;
c_rdcc_nbytes =(size_t) *rdcc_nbytes;
@@ -1111,7 +1111,7 @@ nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_
*/
c_prp_id = (hid_t)*prp_id;
c_mdc_nelmts = (int)*mdc_nelmts;
- c_rdcc_nelmts = (int)*rdcc_nelmts;
+ c_rdcc_nelmts = (size_t)*rdcc_nelmts;
ret = H5Pset_cache(c_prp_id, c_mdc_nelmts, c_rdcc_nelmts, c_rdcc_nbytes, c_rdcc_w0 );
if (ret < 0) return ret_value;
ret_value = 0;
@@ -1137,13 +1137,13 @@ nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_
* EIP October 10, 2003
*---------------------------------------------------------------------------*/
int_f
-nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_f* rdcc_nbytes , real_f* rdcc_w0)
+nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes , real_f* rdcc_w0)
{
int ret_value = -1;
hid_t c_prp_id;
herr_t ret;
int c_mdc_nelmts;
- int c_rdcc_nelmts;
+ size_t c_rdcc_nelmts;
size_t c_rdcc_nbytes;
double c_rdcc_w0;
/*
@@ -1153,7 +1153,7 @@ nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_f
ret = H5Pget_cache(c_prp_id, &c_mdc_nelmts, &c_rdcc_nelmts, &c_rdcc_nbytes, &c_rdcc_w0);
if (ret < 0) return ret_value;
*mdc_nelmts = (int_f)c_mdc_nelmts;
- *rdcc_nelmts = (int_f)c_rdcc_nelmts;
+ *rdcc_nelmts = (size_t_f)c_rdcc_nelmts;
*rdcc_nbytes = (size_t_f)c_rdcc_nbytes;
*rdcc_w0 = (real_f)c_rdcc_w0;
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 9de252e..5715514 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -2110,7 +2110,7 @@
INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
INTEGER, INTENT(IN) :: mdc_nelmts !Number of elements (objects)
! in the meta data cache
- INTEGER, INTENT(IN) :: rdcc_nelmts !Number of elements (objects)
+ INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts !Number of elements (objects)
! in the meta data cache
INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes !Total size of the raw data
!chunk cache, in bytes
@@ -2128,7 +2128,7 @@
!DEC$ ENDIF
INTEGER(HID_T), INTENT(IN) :: prp_id
INTEGER, INTENT(IN) :: mdc_nelmts
- INTEGER, INTENT(IN) :: rdcc_nelmts
+ INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts
INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
REAL, INTENT(IN) :: rdcc_w0
END FUNCTION h5pset_cache_c
@@ -2182,7 +2182,7 @@
INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
INTEGER, INTENT(OUT) :: mdc_nelmts !Number of elements (objects)
! in the meta data cache
- INTEGER, INTENT(OUT) :: rdcc_nelmts !Number of elements (objects)
+ INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts !Number of elements (objects)
! in the meta data cache
INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes !Total size of the raw data
!chunk cache, in bytes
@@ -2201,7 +2201,7 @@
!DEC$ ENDIF
INTEGER(HID_T), INTENT(IN) :: prp_id
INTEGER, INTENT(OUT) :: mdc_nelmts
- INTEGER, INTENT(OUT) :: rdcc_nelmts
+ INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts
INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
REAL, INTENT(OUT) :: rdcc_w0
END FUNCTION h5pget_cache_c
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 06dce79..c66e5ee 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -1033,9 +1033,9 @@ nh5pset_fapl_family_c (hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plis
H5_DLL int_f
nh5pget_fapl_family_c (hid_t_f *prp_id, hsize_t_f* memb_size, hid_t_f* memb_plist );
H5_DLL int_f
-nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_f* rdcc_nbytes, real_f* rdcc_w0);
+nh5pset_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes, real_f* rdcc_w0);
H5_DLL int_f
-nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, int_f* rdcc_nelmts, size_t_f* rdcc_nbytes, real_f* rdcc_w0);
+nh5pget_cache_c(hid_t_f *prp_id, int_f* mdc_nelmts, size_t_f* rdcc_nelmts, size_t_f* rdcc_nbytes, real_f* rdcc_w0);
H5_DLL int_f
nh5pget_fapl_split_c(hid_t_f *prp_id, size_t_f* meta_ext_size , _fcd meta_ext, hid_t_f* meta_plist, size_t_f* raw_ext_size, _fcd raw_ext, hid_t_f * raw_plist);
H5_DLL int_f