summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2009-04-20 15:59:21 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2009-04-20 15:59:21 (GMT)
commit2414c3e60087074d46afa5dfbf8648381aa13c28 (patch)
treeb8358663e2fcf5b3ce1708200d2a1381a9d0165a
parentbc36a358d115d1cddc7328e61a44558c023d20fd (diff)
downloadhdf5-2414c3e60087074d46afa5dfbf8648381aa13c28.zip
hdf5-2414c3e60087074d46afa5dfbf8648381aa13c28.tar.gz
hdf5-2414c3e60087074d46afa5dfbf8648381aa13c28.tar.bz2
[svn-r16796] Changed
H5D_CHUNK_CACHE_NSLOTS_DEFAULT_F H5D_CHUNK_CACHE_NBYTES_DEFAULT_F H5D_CHUNK_CACHE_W0_DEFAULT_F to H5D_CHUNK_CACHE_NSLOTS_DFLT_F H5D_CHUNK_CACHE_NBYTES_DFLT_F H5D_CHUNK_CACHE_W0_DFLT_F to get under the 31 limit for variable names
-rw-r--r--fortran/src/H5Pff.f906
-rw-r--r--fortran/src/H5f90global.f9015
2 files changed, 12 insertions, 9 deletions
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 499ae3f..c35c383 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -7042,9 +7042,9 @@
! Once set, these values will override the values in the file access
! property list. Each of these values can be individually unset
! (or not set at all) by passing the macros:
-! H5D_CHUNK_CACHE_NSLOTS_DEFAULT,
-! H5D_CHUNK_CACHE_NBYTES_DEFAULT, and/or
-! H5D_CHUNK_CACHE_W0_DEFAULT
+! H5D_CHUNK_CACHE_NSLOTS_DFLT_F,
+! H5D_CHUNK_CACHE_NBYTES_DFLT_F, and/or
+! H5D_CHUNK_CACHE_W0_DFLT_F
! as appropriate.
!
! The RDCC_W0 value should be between 0 and 1 inclusive and
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index fd234c7..e037d12 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -348,9 +348,12 @@ MODULE H5GLOBAL
INTEGER :: H5D_FILL_VALUE_DEFAULT_F
INTEGER :: H5D_FILL_VALUE_USER_DEFINED_F
- INTEGER :: H5D_CHUNK_CACHE_NSLOTS_DEFAULT_F
- INTEGER :: H5D_CHUNK_CACHE_NBYTES_DEFAULT_F
- INTEGER :: H5D_CHUNK_CACHE_W0_DEFAULT_F
+! shortened "_DEFAULT" to "_DFLT" to satisfy the limit of 31
+! characters for variable names in Fortran.
+
+ INTEGER :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F
+ INTEGER :: H5D_CHUNK_CACHE_NBYTES_DFLT_F
+ INTEGER :: H5D_CHUNK_CACHE_W0_DFLT_F
EQUIVALENCE(H5D_flags(1), H5D_COMPACT_F)
EQUIVALENCE(H5D_flags(2), H5D_CONTIGUOUS_F)
@@ -376,9 +379,9 @@ MODULE H5GLOBAL
EQUIVALENCE(H5D_flags(18), H5D_FILL_VALUE_DEFAULT_F)
EQUIVALENCE(H5D_flags(19), H5D_FILL_VALUE_USER_DEFINED_F)
- EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_NSLOTS_DEFAULT_F)
- EQUIVALENCE(H5D_flags(21), H5D_CHUNK_CACHE_NBYTES_DEFAULT_F)
- EQUIVALENCE(H5D_flags(22), H5D_CHUNK_CACHE_W0_DEFAULT_F)
+ EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_NSLOTS_DFLT_F)
+ EQUIVALENCE(H5D_flags(21), H5D_CHUNK_CACHE_NBYTES_DFLT_F)
+ EQUIVALENCE(H5D_flags(22), H5D_CHUNK_CACHE_W0_DFLT_F)
!
! H5FD flags declaration