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/H5Iff.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/H5Iff.f90')
| -rw-r--r-- | fortran/src/H5Iff.f90 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fortran/src/H5Iff.f90 b/fortran/src/H5Iff.f90 index 49170be..dd670d6 100644 --- a/fortran/src/H5Iff.f90 +++ b/fortran/src/H5Iff.f90 @@ -79,7 +79,7 @@ INTEGER FUNCTION h5iget_type_c(obj_id, type) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5IGET_TYPE_C':: h5iget_type_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_TYPE_C':: h5iget_type_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: obj_id INTEGER, INTENT(OUT) :: type @@ -134,7 +134,7 @@ INTEGER FUNCTION h5iget_name_c(obj_id, buf, buf_size, name_size) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5IGET_NAME_C'::h5iget_name_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_NAME_C'::h5iget_name_c !DEC$ ENDIF !DEC$ATTRIBUTES reference :: buf INTEGER(HID_T), INTENT(IN) :: obj_id @@ -187,7 +187,7 @@ INTEGER FUNCTION h5iinc_ref_c(obj_id, ref_count) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5IINC_REF_C':: h5iinc_ref_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IINC_REF_C':: h5iinc_ref_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: obj_id INTEGER, INTENT(OUT) :: ref_count @@ -236,7 +236,7 @@ INTEGER FUNCTION h5idec_ref_c(obj_id, ref_count) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5IDEC_REF_C':: h5idec_ref_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IDEC_REF_C':: h5idec_ref_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: obj_id INTEGER, INTENT(OUT) :: ref_count @@ -285,7 +285,7 @@ INTEGER FUNCTION h5iget_ref_c(obj_id, ref_count) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5IGET_REF_C':: h5iget_ref_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_REF_C':: h5iget_ref_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: obj_id INTEGER, INTENT(OUT) :: ref_count @@ -331,7 +331,7 @@ INTEGER FUNCTION h5iget_file_id_c(obj_id, file_id) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5IGET_FILE_ID_C':: h5iget_file_id_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_FILE_ID_C':: h5iget_file_id_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: obj_id INTEGER(HID_T), INTENT(OUT) :: file_id |