[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

1 files changed, 24 insertions, 24 deletions

diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
index c6ac37e..781bd6a 100755
--- a/hl/fortran/src/H5TBff.f90
+++ b/hl/fortran/src/H5TBff.f90
@@ -137,7 +137,7 @@ subroutine h5tbmake_table_f(table_title,&
 
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBMAKE_TABLE_C'::h5tbmake_table_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBMAKE_TABLE_C'::h5tbmake_table_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: table_title
@@ -232,7 +232,7 @@ subroutine h5tbwrite_field_name_f_int(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_INT_C'::h5tbwrite_field_name_int_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_INT_C'::h5tbwrite_field_name_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -307,7 +307,7 @@ subroutine h5tbwrite_field_name_f_float(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_FL_C'::h5tbwrite_field_name_fl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_FL_C'::h5tbwrite_field_name_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -384,7 +384,7 @@ subroutine h5tbwrite_field_name_f_double(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_DL_C'::h5tbwrite_field_name_dl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_DL_C'::h5tbwrite_field_name_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -459,7 +459,7 @@ subroutine h5tbwrite_field_name_f_string(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_ST_C'::h5tbwrite_field_name_st_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_ST_C'::h5tbwrite_field_name_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -535,7 +535,7 @@ subroutine h5tbread_field_name_f_int(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_INT_C'::h5tbread_field_name_int_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_INT_C'::h5tbread_field_name_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -610,7 +610,7 @@ subroutine h5tbread_field_name_f_float(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_FL_C'::h5tbread_field_name_fl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_FL_C'::h5tbread_field_name_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -685,7 +685,7 @@ subroutine h5tbread_field_name_f_double(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_DL_C'::h5tbread_field_name_dl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_DL_C'::h5tbread_field_name_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -760,7 +760,7 @@ subroutine h5tbread_field_name_f_string(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_ST_C'::h5tbread_field_name_st_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_ST_C'::h5tbread_field_name_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -835,7 +835,7 @@ subroutine h5tbwrite_field_index_f_int(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_INT_C'::h5tbwrite_field_index_int_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_INT_C'::h5tbwrite_field_index_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -906,7 +906,7 @@ subroutine h5tbwrite_field_index_f_float(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_FL_C'::h5tbwrite_field_index_fl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_FL_C'::h5tbwrite_field_index_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -979,7 +979,7 @@ subroutine h5tbwrite_field_index_f_double(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_DL_C'::h5tbwrite_field_index_dl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_DL_C'::h5tbwrite_field_index_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -1050,7 +1050,7 @@ subroutine h5tbwrite_field_index_f_string(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_ST_C'::h5tbwrite_field_index_st_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_ST_C'::h5tbwrite_field_index_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -1122,7 +1122,7 @@ subroutine h5tbread_field_index_f_int(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_INT_C'::h5tbread_field_index_int_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_INT_C'::h5tbread_field_index_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -1193,7 +1193,7 @@ subroutine h5tbread_field_index_f_float(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_FL_C'::h5tbread_field_index_fl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_FL_C'::h5tbread_field_index_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -1264,7 +1264,7 @@ subroutine h5tbread_field_index_f_double(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_DL_C'::h5tbread_field_index_dl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_DL_C'::h5tbread_field_index_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -1335,7 +1335,7 @@ subroutine h5tbread_field_index_f_string(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_ST_C'::h5tbread_field_index_st_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_ST_C'::h5tbread_field_index_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
@@ -1406,7 +1406,7 @@ subroutine h5tbinsert_field_f_int(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_INT_C'::h5tbinsert_field_int_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_INT_C'::h5tbinsert_field_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -1479,7 +1479,7 @@ subroutine h5tbinsert_field_f_float(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_FL_C'::h5tbinsert_field_fl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_FL_C'::h5tbinsert_field_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -1552,7 +1552,7 @@ subroutine h5tbinsert_field_f_double(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_DL_C'::h5tbinsert_field_dl_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_DL_C'::h5tbinsert_field_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -1626,7 +1626,7 @@ subroutine h5tbinsert_field_f_string(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_ST_C'::h5tbinsert_field_st_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_ST_C'::h5tbinsert_field_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -1693,7 +1693,7 @@ subroutine h5tbdelete_field_f(loc_id,&
  
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBDELETE_FIELD_C'::h5tbdelete_field_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBDELETE_FIELD_C'::h5tbdelete_field_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
@@ -1757,7 +1757,7 @@ subroutine h5tbget_table_info_f(loc_id,&
   integer function h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBGET_TABLE_INFO_C'::h5tbget_table_info_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBGET_TABLE_INFO_C'::h5tbget_table_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
@@ -1827,7 +1827,7 @@ subroutine h5tbget_field_info_f(loc_id,&
 
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-  !MS$ATTRIBUTES C,reference,alias:'_H5TBGET_FIELD_INFO_C'::h5tbget_field_info_c
+  !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBGET_FIELD_INFO_C'::h5tbget_field_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier