summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2013-03-29 13:34:25 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2013-03-29 13:34:25 (GMT)
commit2571bbbc7b52cf776433af69f7078bf0d75d9ef6 (patch)
tree279244ba03401e17781b273d02a9f9d9a981d8bd /fortran/test
parent8461df0911aecf6665b4a19d4a66e4d11bc31e3c (diff)
downloadhdf5-2571bbbc7b52cf776433af69f7078bf0d75d9ef6.zip
hdf5-2571bbbc7b52cf776433af69f7078bf0d75d9ef6.tar.gz
hdf5-2571bbbc7b52cf776433af69f7078bf0d75d9ef6.tar.bz2
[svn-r23488] merged windows dll changes from the trunk to the branch.
svn merge -r23351:23487 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran . Tested: windows.
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/tf.f9011
1 files changed, 4 insertions, 7 deletions
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index d5c32c8..4f73fda 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -30,7 +30,7 @@
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: verify_real
+!DEC$attributes dllexport :: verify_real_kind_7
!DEC$endif
SUBROUTINE verify_real_kind_7(string,value,correct_value,total_error)
USE HDF5
@@ -115,7 +115,7 @@ END SUBROUTINE verify
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: verify
+!DEC$attributes dllexport :: verify_Fortran_INTEGER_4
!DEC$endif
SUBROUTINE verify_Fortran_INTEGER_4(string,value,correct_value,total_error)
USE HDF5
@@ -129,9 +129,6 @@ SUBROUTINE verify_Fortran_INTEGER_4(string,value,correct_value,total_error)
RETURN
END SUBROUTINE verify_Fortran_INTEGER_4
-
-
-
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$attributes dllexport :: verifyLogical
@@ -151,7 +148,7 @@ END SUBROUTINE verifyLogical
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$attributes dllexport :: verifyString
!DEC$endif
-SUBROUTINE verifystring(string, value,correct_value,total_error)
+SUBROUTINE verifyString(string, value,correct_value,total_error)
CHARACTER*(*) :: string
CHARACTER*(*) :: value, correct_value
INTEGER :: total_error
@@ -160,7 +157,7 @@ SUBROUTINE verifystring(string, value,correct_value,total_error)
WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
ENDIF
RETURN
-END SUBROUTINE verifystring
+END SUBROUTINE verifyString
!----------------------------------------------------------------------