[svn-r8357]

Purpose: Maintenance

Description: Fortran functions h5dwrite/read_f and h5awrite/read_f
             were overloaded with the dims parameter being of type
             INTEGER. It was a design flaw. dims should be of type
             INTEGER(HSIZE_T). Overloading was done to assure backward
             compatibility of 1.4.* branch with hdf5 1.2.* branch.

             We promised to remove the old function with INTEGER dims
             in 1.6.0. It was removed from the documentation but
             was not removed from the source code.

Solution: Finally cleaned up the code.

Platforms tested: Windows 2000 with DEC Fortran, LInux with Intel Fortran,
                  Solaris 2.7 32/64-bit mode.

Misc. update:

1 files changed, 38 insertions, 38 deletions

diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90
index 97cebe1..9669372 100644
--- a/fortran/src/H5Rff.f90
+++ b/fortran/src/H5Rff.f90
@@ -90,9 +90,9 @@
           SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr) 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5rcreate_object_f
-!DEC$endif
+!FooDECSif defined(BUILD_HDF5_DLL)
+!FooDECSattributes dllexport :: h5rcreate_object_f
+!FooDECSendif
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier 
@@ -110,10 +110,10 @@
             INTERFACE
               INTEGER FUNCTION h5rcreate_object_c(ref_f, loc_id, name, namelen)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5RCREATE_OBJECT_C':: h5rcreate_object_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
+              !FooDECS IF DEFINED(HDF5F90_WINDOWS)
+              !FooMSSATTRIBUTES C,reference,alias:'_H5RCREATE_OBJECT_C':: h5rcreate_object_c
+              !FooDECS ENDIF
+              !FooDECSATTRIBUTES reference :: name 
 !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
               INTEGER :: ref_f(REF_OBJ_BUF_LEN)
               INTEGER(HID_T), INTENT(IN) :: loc_id  
@@ -160,9 +160,9 @@
           SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr) 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5rcreate_region_f
-!DEC$endif
+!FooDECSif defined(BUILD_HDF5_DLL)
+!FooDECSattributes dllexport :: h5rcreate_region_f
+!FooDECSendif
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier 
@@ -181,10 +181,10 @@
             INTERFACE
               INTEGER FUNCTION h5rcreate_region_c(ref_f, loc_id, name, namelen, space_id)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5RCREATE_REGION_C':: h5rcreate_region_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
+              !FooDECS IF DEFINED(HDF5F90_WINDOWS)
+              !FooMSSATTRIBUTES C,reference,alias:'_H5RCREATE_REGION_C':: h5rcreate_region_c
+              !FooDECS ENDIF
+              !FooDECSATTRIBUTES reference :: name 
 !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
               INTEGER :: ref_f(REF_REG_BUF_LEN)
               INTEGER(HID_T), INTENT(IN) :: loc_id  
@@ -233,9 +233,9 @@
           SUBROUTINE h5rdereference_object_f(dset_id, ref, obj_id, hdferr) 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5rdereference_object_f
-!DEC$endif
+!FooDECSif defined(BUILD_HDF5_DLL)
+!FooDECSattributes dllexport :: h5rdereference_object_f
+!FooDECSendif
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
@@ -252,9 +252,9 @@
             INTERFACE
               INTEGER FUNCTION h5rdereference_object_c(dset_id, ref_f, obj_id)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-           !MS$ATTRIBUTES C,reference,alias:'_H5RDEREFERENCE_OBJECT_C':: h5rdereference_object_c
-              !DEC$ ENDIF
+              !FooDECS IF DEFINED(HDF5F90_WINDOWS)
+           !FooMSSATTRIBUTES C,reference,alias:'_H5RDEREFERENCE_OBJECT_C':: h5rdereference_object_c
+              !FooDECS ENDIF
 !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
               INTEGER(HID_T), INTENT(IN) :: dset_id  
               INTEGER :: ref_f(REF_OBJ_BUF_LEN)
@@ -299,9 +299,9 @@
           SUBROUTINE h5rdereference_region_f(dset_id, ref, obj_id, hdferr) 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5rdereference_region_f
-!DEC$endif
+!FooDECSif defined(BUILD_HDF5_DLL)
+!FooDECSattributes dllexport :: h5rdereference_region_f
+!FooDECSendif
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
@@ -318,9 +318,9 @@
             INTERFACE
               INTEGER FUNCTION h5rdereference_region_c(dset_id, ref_f, obj_id)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-           !MS$ATTRIBUTES C,reference,alias:'_H5RDEREFERENCE_REGION_C':: h5rdereference_region_c
-              !DEC$ ENDIF
+              !FooDECS IF DEFINED(HDF5F90_WINDOWS)
+           !FooMSSATTRIBUTES C,reference,alias:'_H5RDEREFERENCE_REGION_C':: h5rdereference_region_c
+              !FooDECS ENDIF
               INTEGER(HID_T), INTENT(IN) :: dset_id  
 !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
               INTEGER :: ref_f(REF_REG_BUF_LEN)
@@ -367,9 +367,9 @@
           SUBROUTINE h5rget_region_region_f(dset_id, ref, space_id, hdferr) 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5rget_region_region_f
-!DEC$endif
+!FooDECSif defined(BUILD_HDF5_DLL)
+!FooDECSattributes dllexport :: h5rget_region_region_f
+!FooDECSendif
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
@@ -384,9 +384,9 @@
             INTERFACE
               INTEGER FUNCTION h5rget_region_region_c(dset_id, ref_f, space_id)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-           !MS$ATTRIBUTES C,reference,alias:'_H5RGET_REGION_REGION_C':: h5rget_region_region_c
-              !DEC$ ENDIF
+              !FooDECS IF DEFINED(HDF5F90_WINDOWS)
+           !FooMSSATTRIBUTES C,reference,alias:'_H5RGET_REGION_REGION_C':: h5rget_region_region_c
+              !FooDECS ENDIF
               INTEGER(HID_T), INTENT(IN) :: dset_id  
 !              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
               INTEGER :: ref_f(REF_REG_BUF_LEN)
@@ -437,9 +437,9 @@
           SUBROUTINE h5rget_object_type_obj_f(dset_id, ref, obj_type, hdferr) 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5rget_object_type_obj_f
-!DEC$endif
+!FooDECSif defined(BUILD_HDF5_DLL)
+!FooDECSattributes dllexport :: h5rget_object_type_obj_f
+!FooDECSendif
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
@@ -460,9 +460,9 @@
             INTERFACE
               INTEGER FUNCTION h5rget_object_type_obj_c(dset_id, ref_f, obj_type)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-           !MS$ATTRIBUTES C,reference,alias:'_H5RGET_OBJECT_TYPE_OBJ_C':: h5rget_object_type_obj_c
-              !DEC$ ENDIF
+              !FooDECS IF DEFINED(HDF5F90_WINDOWS)
+           !FooMSSATTRIBUTES C,reference,alias:'_H5RGET_OBJECT_TYPE_OBJ_C':: h5rget_object_type_obj_c
+              !FooDECS ENDIF
 !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
               INTEGER(HID_T), INTENT(IN) :: dset_id  
               INTEGER :: ref_f(REF_OBJ_BUF_LEN)