summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-04-15 13:49:33 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-04-15 13:49:33 (GMT)
commit9f4ed2197a8ce8c99ee84c7a7be9ecfa42d21044 (patch)
tree6960de5b0399d2d8710589a7505c4674c8519734 /fortran
parentd7fbbda1a099e108c8fbf7a9a50020d8785a1f5b (diff)
parent1644eda6dee3ee13443d970f291a3d87a830db48 (diff)
downloadhdf5-9f4ed2197a8ce8c99ee84c7a7be9ecfa42d21044.zip
hdf5-9f4ed2197a8ce8c99ee84c7a7be9ecfa42d21044.tar.gz
hdf5-9f4ed2197a8ce8c99ee84c7a7be9ecfa42d21044.tar.bz2
[svn-r26814] svn merge -r26807:26813 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5Zf.c8
-rw-r--r--fortran/src/H5Zff.F9049
-rw-r--r--fortran/src/H5f90proto.h12
3 files changed, 24 insertions, 45 deletions
diff --git a/fortran/src/H5Zf.c b/fortran/src/H5Zf.c
index 0427c23..cfe96ec 100644
--- a/fortran/src/H5Zf.c
+++ b/fortran/src/H5Zf.c
@@ -40,7 +40,7 @@
* SOURCE
*/
int_f
-nh5zunregister_c (int_f *filter)
+h5zunregister_c (int_f *filter)
/******/
{
int ret_value = -1;
@@ -51,9 +51,7 @@ nh5zunregister_c (int_f *filter)
* Call H5Zunregister function.
*/
c_filter = (H5Z_filter_t)*filter;
- printf(" filter # %d \n", (int)c_filter);
status = H5Zunregister(c_filter);
- printf("From C zunregister %d \n", status);
if (status < 0) return ret_value;
ret_value = 0;
return ret_value;
@@ -78,7 +76,7 @@ nh5zunregister_c (int_f *filter)
*/
int_f
-nh5zfilter_avail_c ( int_f *filter , int_f *flag )
+h5zfilter_avail_c ( int_f *filter , int_f *flag )
/******/
{
int ret_value = 0;
@@ -113,7 +111,7 @@ nh5zfilter_avail_c ( int_f *filter , int_f *flag )
*/
int_f
-nh5zget_filter_info_c ( int_f *filter , int_f *flag )
+h5zget_filter_info_c ( int_f *filter , int_f *flag )
/******/
{
int ret_value = 0;
diff --git a/fortran/src/H5Zff.F90 b/fortran/src/H5Zff.F90
index 7b67b5b..416488a 100644
--- a/fortran/src/H5Zff.F90
+++ b/fortran/src/H5Zff.F90
@@ -4,25 +4,22 @@
! MODULE H5Z
!
! PURPOSE
-! This file contains Fortran interfaces for H5Z functions. It includes
-! all the functions that are independent on whether the Fortran 2003 functions
-! are enabled or disabled.
-!
+! This file contains Fortran interfaces for H5Z functions.
!
! COPYRIGHT
! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! Copyright by The HDF Group. *
-! Copyright by the Board of Trustees of the University of Illinois. *
-! All rights reserved. *
-! *
-! This file is part of HDF5. The full HDF5 copyright notice, including *
-! terms governing use, modification, and redistribution, is contained in *
-! the files COPYING and Copyright.html. COPYING can be found at the root *
-! of the source code distribution tree; Copyright.html can be found at the *
-! root level of an installed copy of the electronic HDF5 document set and *
-! is linked from the top-level documents page. It can also be found at *
-! http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *
-! access to either file, you may request a copy from help@hdfgroup.org. *
+! Copyright by The HDF Group. *
+! Copyright by the Board of Trustees of the University of Illinois. *
+! All rights reserved. *
+! *
+! This file is part of HDF5. The full HDF5 copyright notice, including *
+! terms governing use, modification, and redistribution, is contained in *
+! the files COPYING and Copyright.html. COPYING can be found at the root *
+! of the source code distribution tree; Copyright.html can be found at the *
+! root level of an installed copy of the electronic HDF5 document set and *
+! is linked from the top-level documents page. It can also be found at *
+! http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have *
+! access to either file, you may request a copy from help@hdfgroup.org. *
! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
!
! NOTES
@@ -69,18 +66,14 @@ CONTAINS
SUBROUTINE h5zunregister_f(filter, hdferr)
IMPLICIT NONE
INTEGER, INTENT(IN) :: filter
- INTEGER, INTENT(OUT) :: hdferr ! Error code
+ INTEGER, INTENT(OUT) :: hdferr
!*****
INTERFACE
- INTEGER FUNCTION h5zunregister_c (filter)
- USE H5GLOBAL
- !DEC$IF DEFINED(HDF5F90_WINDOWS)
- !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ZUNREGISTER_C':: h5zunregister_c
- !DEC$ENDIF
+ INTEGER FUNCTION h5zunregister_c(filter) BIND(C,NAME='h5zunregister_c')
INTEGER, INTENT(IN) :: filter
END FUNCTION h5zunregister_c
END INTERFACE
- hdferr = h5zunregister_c (filter)
+ hdferr = h5zunregister_c(filter)
END SUBROUTINE h5zunregister_f
!****s* H5Z/h5zfilter_avail_f
@@ -121,11 +114,8 @@ CONTAINS
INTEGER :: flag ! "TRUE/FALSE/ERROR from C"
INTERFACE
- INTEGER FUNCTION h5zfilter_avail_c(filter, flag)
+ INTEGER FUNCTION h5zfilter_avail_c(filter, flag) BIND(C,NAME='h5zfilter_avail_c')
USE H5GLOBAL
- !DEC$IF DEFINED(HDF5F90_WINDOWS)
- !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ZFILTER_AVAIL_C'::h5zfilter_avail_c
- !DEC$ENDIF
INTEGER, INTENT(IN) :: filter
INTEGER :: flag
END FUNCTION h5zfilter_avail_c
@@ -176,11 +166,8 @@ CONTAINS
!*****
INTERFACE
- INTEGER FUNCTION h5zget_filter_info_c(filter, config_flags)
+ INTEGER FUNCTION h5zget_filter_info_c(filter, config_flags) BIND(C,NAME='h5zget_filter_info_c')
USE H5GLOBAL
- !DEC$IF DEFINED(HDF5F90_WINDOWS)
- !DEC$ATTRIBUTES C,reference,decorate,alias:'H5ZGET_FILTER_INFO_C'::h5zget_filter_info_c
- !DEC$ENDIF
INTEGER, INTENT(IN) :: filter
INTEGER, INTENT(OUT) :: config_flags
END FUNCTION h5zget_filter_info_c
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 115f8f1..04462cd 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -1239,15 +1239,9 @@ H5_FCDLL int_f nh5dont_atexit_c(void);
/*
* Functions from H5Zf.c
*/
-#define nh5zunregister_c H5_FC_FUNC_(h5zunregister_c, H5ZUNREGISTER_C)
-#define nh5zfilter_avail_c H5_FC_FUNC_(h5zfilter_avail_c, H5ZFILTER_AVAIL_C)
-#define nh5zget_filter_info_c H5_FC_FUNC_(h5zget_filter_info_c, H5ZGET_FILTER_INFO_C)
-
-
-H5_FCDLL int_f nh5zunregister_c (int_f *filter);
-H5_FCDLL int_f nh5zfilter_avail_c (int_f *filter, int_f *flag);
-H5_FCDLL int_f nh5zget_filter_info_c (int_f *filter, int_f *flag);
-
+H5_FCDLL int_f h5zunregister_c (int_f *filter);
+H5_FCDLL int_f h5zfilter_avail_c (int_f *filter, int_f *flag);
+H5_FCDLL int_f h5zget_filter_info_c (int_f *filter, int_f *flag);
/*
* Functions from H5Lf.c