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/test | |
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/test')
-rw-r--r-- | fortran/test/tf.f90 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90 index ded4ed0..673a8e2 100644 --- a/fortran/test/tf.f90 +++ b/fortran/test/tf.f90 @@ -90,7 +90,7 @@ full_name, full_namelen) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5_FIXNAME_C':: h5_fixname_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c !DEC$ ENDIF !DEC$ATTRIBUTES reference :: base_name !DEC$ATTRIBUTES reference :: full_name @@ -146,7 +146,7 @@ INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5_CLEANUP_C':: h5_cleanup_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c !DEC$ ENDIF !DEC$ATTRIBUTES reference :: base_name CHARACTER(LEN=*), INTENT(IN) :: base_name @@ -192,7 +192,7 @@ INTERFACE SUBROUTINE h5_exit_c(status) !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5_EXIT_C':: h5_exit_c + !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c !DEC$ ENDIF INTEGER, INTENT(IN) :: status END SUBROUTINE h5_exit_c |