[svn-r25237] Merged changes from the trunk to the branch,

svn merge -r25009:25235 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi)

7 files changed, 29 insertions, 33 deletions

diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 98e5ff6..cd354c7 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -418,18 +418,18 @@ nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
 
 /****if* H5Pf/h5pset_fill_value_c
  * NAME
- *        h5pset_fill_value_c
+ *  h5pset_fill_value_c
  * PURPOSE
- *     Call H5Pset_fill_value to set a fillvalue for a dataset
+ *  Call H5Pset_fill_value to set a fillvalue for a dataset
  * INPUTS
- *      prp_id - property list identifier
- *              type_id - datatype identifier (fill value is of type type_id)
- *              fillvalue - fillvalue
+ *  prp_id     - property list identifier
+ *  type_id    - datatype identifier (fill value is of type type_id)
+ *  fillvalue - fillvalue
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * SOURCE
 */
 int_f
@@ -445,7 +445,7 @@ nh5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
       * Call H5Pset_fill_value function.
       */
      c_prp_id = (hid_t)*prp_id;
-     c_type_id = (int)*type_id;
+     c_type_id = (hid_t)*type_id;
      ret = H5Pset_fill_value(c_prp_id, c_type_id, fillvalue);
 
      if (ret < 0) return ret_value;
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index dcfcfc4..05e525d 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -460,13 +460,13 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
 /*
  *  H5FD flags of type hid_t
  */
-    h5fd_hid_flags[0] = (int_f)H5FD_CORE;
-    h5fd_hid_flags[1] = (int_f)H5FD_FAMILY;
-    h5fd_hid_flags[2] = (int_f)H5FD_LOG;
-    h5fd_hid_flags[3] = (int_f)H5FD_MPIO;
-    h5fd_hid_flags[4] = (int_f)H5FD_MULTI;
-    h5fd_hid_flags[5] = (int_f)H5FD_SEC2;
-    h5fd_hid_flags[6] = (int_f)H5FD_STDIO;
+    h5fd_hid_flags[0] = (hid_t_f)H5FD_CORE;
+    h5fd_hid_flags[1] = (hid_t_f)H5FD_FAMILY;
+    h5fd_hid_flags[2] = (hid_t_f)H5FD_LOG;
+    h5fd_hid_flags[3] = (hid_t_f)H5FD_MPIO;
+    h5fd_hid_flags[4] = (hid_t_f)H5FD_MULTI;
+    h5fd_hid_flags[5] = (hid_t_f)H5FD_SEC2;
+    h5fd_hid_flags[6] = (hid_t_f)H5FD_STDIO;
 
 /*
  *  H5G flags
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 17c55a5..28b2ae1 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -83,7 +83,6 @@ set_target_properties (testhdf5_fortran PROPERTIES FOLDER test/fortran)
 #-- Adding test for testhdf5_fortran_1_8
 add_executable (testhdf5_fortran_1_8
     fortranlib_test_1_8.f90
-    tH5F.f90
     tH5O.f90
     tH5A_1_8.f90
     tH5G_1_8.f90
@@ -107,7 +106,6 @@ set_target_properties (testhdf5_fortran_1_8 PROPERTIES FOLDER test/fortran)
 if (HDF5_ENABLE_F2003)
   add_executable (fortranlib_test_F03
       fortranlib_test_F03.f90
-      tH5F.f90
       tH5E_F03.f90
       tH5F_F03.f90
       tH5L_F03.f90
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 9c6b906..c0b5395 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -63,11 +63,11 @@ fortranlib_test_CFLAGS=$(AM_CFLAGS)
 fortranlib_test_SOURCES = tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
         tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tHDF5.f90 fortranlib_test.f90
 
-fortranlib_test_1_8_SOURCES = tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 tH5MISC_1_8.f90 tHDF5_1_8.f90\
+fortranlib_test_1_8_SOURCES = tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 tH5MISC_1_8.f90 tHDF5_1_8.f90\
         fortranlib_test_1_8.f90
 
 if FORTRAN_2003_CONDITIONAL_F
-   fortranlib_test_F03_SOURCES = tH5F.f90 tH5E_F03.f90 tH5F_F03.f90 tH5L_F03.f90 \
+   fortranlib_test_F03_SOURCES = tH5E_F03.f90 tH5F_F03.f90 tH5L_F03.f90 \
         tH5O_F03.f90 tH5P_F03.f90 tH5T_F03.f90 tHDF5_F03.f90 fortranlib_test_F03.f90
 endif
 
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index bd1d01d..89db8f4 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -138,18 +138,17 @@ fortranlib_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \
 	$(fortranlib_test_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-am_fortranlib_test_1_8_OBJECTS = tH5F.$(OBJEXT) tH5O.$(OBJEXT) \
-	tH5A_1_8.$(OBJEXT) tH5G_1_8.$(OBJEXT) tH5MISC_1_8.$(OBJEXT) \
-	tHDF5_1_8.$(OBJEXT) fortranlib_test_1_8.$(OBJEXT)
+am_fortranlib_test_1_8_OBJECTS = tH5O.$(OBJEXT) tH5A_1_8.$(OBJEXT) \
+	tH5G_1_8.$(OBJEXT) tH5MISC_1_8.$(OBJEXT) tHDF5_1_8.$(OBJEXT) \
+	fortranlib_test_1_8.$(OBJEXT)
 fortranlib_test_1_8_OBJECTS = $(am_fortranlib_test_1_8_OBJECTS)
 fortranlib_test_1_8_LDADD = $(LDADD)
 fortranlib_test_1_8_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
 	$(LIBH5F) $(LIBHDF5)
-am__fortranlib_test_F03_SOURCES_DIST = tH5F.f90 tH5E_F03.f90 \
-	tH5F_F03.f90 tH5L_F03.f90 tH5O_F03.f90 tH5P_F03.f90 \
-	tH5T_F03.f90 tHDF5_F03.f90 fortranlib_test_F03.f90
+am__fortranlib_test_F03_SOURCES_DIST = tH5E_F03.f90 tH5F_F03.f90 \
+	tH5L_F03.f90 tH5O_F03.f90 tH5P_F03.f90 tH5T_F03.f90 \
+	tHDF5_F03.f90 fortranlib_test_F03.f90
 @FORTRAN_2003_CONDITIONAL_F_TRUE@am_fortranlib_test_F03_OBJECTS =  \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5F.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5E_F03.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5F_F03.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5L_F03.$(OBJEXT) \
@@ -749,10 +748,10 @@ fortranlib_test_CFLAGS = $(AM_CFLAGS)
 fortranlib_test_SOURCES = tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 \
         tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tHDF5.f90 fortranlib_test.f90
 
-fortranlib_test_1_8_SOURCES = tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 tH5MISC_1_8.f90 tHDF5_1_8.f90\
+fortranlib_test_1_8_SOURCES = tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 tH5MISC_1_8.f90 tHDF5_1_8.f90\
         fortranlib_test_1_8.f90
 
-@FORTRAN_2003_CONDITIONAL_F_TRUE@fortranlib_test_F03_SOURCES = tH5F.f90 tH5E_F03.f90 tH5F_F03.f90 tH5L_F03.f90 \
+@FORTRAN_2003_CONDITIONAL_F_TRUE@fortranlib_test_F03_SOURCES = tH5E_F03.f90 tH5F_F03.f90 tH5L_F03.f90 \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@        tH5O_F03.f90 tH5P_F03.f90 tH5T_F03.f90 tHDF5_F03.f90 fortranlib_test_F03.f90
 
 fflush1_SOURCES = fflush1.f90
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
index 66f799b..039dc6c 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -58,10 +58,10 @@ PROGRAM fortranlibtest
   ENDIF
   WRITE(*,*)
 
-  ret_total_error = 0
-  CALL file_space("file_space_1_8",cleanup, ret_total_error)
-  CALL write_test_status(ret_total_error, &
-       ' Testing file free space', &
+  CALL h5eset_auto_f(0, ret_total_error)
+  IF(ret_total_error.NE.0) &
+       CALL write_test_status(ret_total_error, &
+       ' h5eset_auto_f', &
        total_error)
 
   ret_total_error = 0
diff --git a/fortran/test/tHDF5_1_8.f90 b/fortran/test/tHDF5_1_8.f90
index 47eec16..9d1c3ec 100644
--- a/fortran/test/tHDF5_1_8.f90
+++ b/fortran/test/tHDF5_1_8.f90
@@ -33,6 +33,5 @@ MODULE THDF5_1_8
   USE TH5MISC_1_8
   USE TH5A_1_8
   USE TH5G_1_8
-  USE TH5F
   USE TH5O
 END MODULE THDF5_1_8