[svn-r25819] Bring revisions #25440 - #25484 from trunk to revise_chunks.

h5committested.
(Revision #25439 is skipped because it was backed out later on 11/3/2104.)

5 files changed, 30 insertions, 33 deletions

diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 66f6634..a4407e5 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -156,10 +156,10 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
 # Fortran 2003 standard
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_F2003)
-  # default real is 4 bytes, so include double signatures
+  # F2003 features are enabled
   set (F_STATUS "_F03")
 else (HDF5_ENABLE_F2003)
-  # default real is 8 bytes, so exclude double signatures
+  # F2003 features are not enabled
   set (F_STATUS "_F90")
 endif (HDF5_ENABLE_F2003)
 
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index cd354c7..b66709a 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -483,19 +483,21 @@ nh5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
 
 /****if* H5Pf/h5pget_fill_valuec_c
  * NAME
- *        h5pget_fill_valuec_c
+ *  h5pget_fill_valuec_c
  * PURPOSE
- *     Call h5pget_fill_value_c to a character fill value
+ *  Call h5pget_fill_value_c to a character fill value
  * INPUTS
- *      prp_id - property list identifier
- *              type_id - datatype identifier (fill value is of type type_id)
- *              fillvalue  - character value
+ *  prp_id     - property list identifier
+ *  type_id    - datatype identifier (fill value is of type type_id)
+ *  fillvalue - character value
  * RETURNS
- *     0 on success, -1 on failure
- *              Saturday, August 14, 1999
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
+ *  Saturday, August 14, 1999
  * HISTORY
+ *  Fixed wrong call to C wrapper, was nh5pset_fill_value_c, changed
+ *  to nh5pget_fill_value_c. MSB - 7/21/2014
  *
  * SOURCE
 */
@@ -506,27 +508,27 @@ nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
      int ret_value = -1;
 
      /*
-      * Call h5pget_fill_value_c  function.
+      * Call h5pget_fill_value_c function.
       */
-     ret_value = nh5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
+     ret_value = nh5pget_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
 
      return ret_value;
 }
 
 /****if* H5Pf/h5pget_fill_value_c
  * NAME
- *        h5pget_fill_value_c
+ *  h5pget_fill_value_c
  * PURPOSE
- *     Call H5Pget_fill_value to set a fillvalue for a dataset
+ *  Call H5Pget_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
@@ -542,7 +544,7 @@ nh5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
       * Call H5Pget_fill_value function.
       */
      c_prp_id = (hid_t)*prp_id;
-     c_type_id = (int)*type_id;
+     c_type_id = (hid_t)*type_id;
      ret = H5Pget_fill_value(c_prp_id, c_type_id, fillvalue);
 
      if (ret < 0) return ret_value;
@@ -556,7 +558,7 @@ nh5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue
      /*
       * Call h5pget_fill_value_c  function.
       */
-     return nh5pset_fill_value_c(prp_id, type_id, fillvalue);
+     return nh5pget_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 int_f
@@ -565,7 +567,7 @@ nh5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      /*
       * Call h5pget_fill_value_c  function.
       */
-     return nh5pset_fill_value_c(prp_id, type_id, fillvalue);
+     return nh5pget_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 int_f
@@ -574,7 +576,7 @@ nh5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      /*
       * Call h5pget_fill_value_c  function.
       */
-     return nh5pset_fill_value_c(prp_id, type_id, fillvalue);
+     return nh5pget_fill_value_c(prp_id, type_id, fillvalue);
 }
 
 /****if* H5Pf/h5pget_version_c
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 231891a..8b370f3 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -732,7 +732,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 180
+LT_VERS_REVISION = 181
 LT_VERS_AGE = 0
 AM_FCLIBS = $(LIBHDF5)
 
diff --git a/fortran/test/tH5O_F03.f90 b/fortran/test/tH5O_F03.f90
index 598e83e..b7003b3 100644
--- a/fortran/test/tH5O_F03.f90
+++ b/fortran/test/tH5O_F03.f90
@@ -68,7 +68,7 @@ CONTAINS
 
     IMPLICIT NONE
 
-    INTEGER(HID_T) :: group_id
+    INTEGER(HID_T), VALUE :: group_id
     CHARACTER(LEN=1), DIMENSION(1:180) :: name
     TYPE(h5o_info_t) :: oinfo
     TYPE(ovisit_ud_t) :: op_data
diff --git a/fortran/test/tH5P_F03.f90 b/fortran/test/tH5P_F03.f90
index 91d9e3a..ae48114 100644
--- a/fortran/test/tH5P_F03.f90
+++ b/fortran/test/tH5P_F03.f90
@@ -43,7 +43,7 @@ MODULE test_genprop_cls_cb1_mod
   USE ISO_C_BINDING
   IMPLICIT NONE
   
-  TYPE, bind(C) :: cop_cb_struct_ ! /* Struct for iterations */
+  TYPE, BIND(C) :: cop_cb_struct_ ! /* Struct for iterations */
     INTEGER :: count
     INTEGER(HID_T) :: id
   END TYPE cop_cb_struct_
@@ -59,10 +59,10 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN), VALUE :: list_id
     
     TYPE(cop_cb_struct_) :: create_data
-    
+
     create_data%count = create_data%count + 1
     create_data%id = list_id
-    
+
     test_genprop_cls_cb1_f = 0
     
   END FUNCTION test_genprop_cls_cb1_f
@@ -243,12 +243,7 @@ SUBROUTINE test_genprop_class_callback(total_error)
   INTEGER(hid_t) :: lid2 !/* 2nd Generic Property list ID */
   INTEGER(size_t) :: nprops !/* Number of properties in class */
 
-  TYPE cb_struct
-     INTEGER :: count
-     INTEGER(hid_t) :: id
-  END TYPE cb_struct
-
-  TYPE(cb_struct), TARGET :: crt_cb_struct, cls_cb_struct
+  TYPE(cop_cb_struct_), TARGET :: crt_cb_struct, cls_cb_struct
 
   CHARACTER(LEN=7) :: CLASS1_NAME = "Class 1"
   TYPE(C_FUNPTR) :: f1, f5