diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2007-08-09 14:04:05 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2007-08-09 14:04:05 (GMT) |
| commit | 20be26bdc6e290bfda1839d94783142c51f1846b (patch) | |
| tree | a64167bba3d699697ed0529296af8922be3b1023 /fortran/src/H5Rff.f90 | |
| parent | 88c194fd78c0c0ca9729fe3671dcf3ebc9a36ddb (diff) | |
| download | hdf5-20be26bdc6e290bfda1839d94783142c51f1846b.zip hdf5-20be26bdc6e290bfda1839d94783142c51f1846b.tar.gz hdf5-20be26bdc6e290bfda1839d94783142c51f1846b.tar.bz2 | |
[svn-r14057] Purpose: Fixes for 64-bit Windows Intel Fortran 9.1
Description:
We are porting Fortran to 64-bit Windows, and need to make many syntactical changes to bring the code up to date. We now go back to using "!DEC$" rather than "!MS$" in our "ATTRIBUTE" code. Also, the naming conventions for mixed language is inconsistent from 32- to 64- bit Windows. To make up with this, we use the "decorate" flag. We also needed to change the "calling convention" in project settings from "CVF" to "default".
Also other minor cleanups on project files.
Tested:
32-bit: VS.NET and VS2005
64-bit: VS2005
Diffstat (limited to 'fortran/src/H5Rff.f90')
| -rw-r--r-- | fortran/src/H5Rff.f90 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90 index 8ce0e7f..6400f43 100644 --- a/fortran/src/H5Rff.f90 +++ b/fortran/src/H5Rff.f90 @@ -112,7 +112,7 @@ 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$ ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_OBJECT_C':: h5rcreate_object_c !DEC$ ENDIF !DEC$ATTRIBUTES reference :: name INTEGER(HADDR_T) :: ref_f @@ -182,7 +182,7 @@ 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$ ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_REGION_C':: h5rcreate_region_c !DEC$ ENDIF !DEC$ATTRIBUTES reference :: name ! INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 @@ -253,7 +253,7 @@ 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$ ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_OBJECT_C':: h5rdereference_object_c !DEC$ ENDIF ! INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2 INTEGER(HID_T), INTENT(IN) :: dset_id @@ -319,7 +319,7 @@ 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$ ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_REGION_C':: h5rdereference_region_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: dset_id ! INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 @@ -385,7 +385,7 @@ 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$ ATTRIBUTES C,reference,decorate,alias:'H5RGET_REGION_REGION_C':: h5rget_region_region_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: dset_id ! INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 @@ -461,7 +461,7 @@ 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$ ATTRIBUTES C,reference,decorate,alias:'H5RGET_OBJECT_TYPE_OBJ_C':: h5rget_object_type_obj_c !DEC$ ENDIF ! INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2 INTEGER(HID_T), INTENT(IN) :: dset_id |