Merge branch 'develop' into hdf5_1_10.sync

5 files changed, 15 insertions, 15 deletions

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index c836c17..68b817e 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -54,7 +54,7 @@ foreach (example ${examples})
 #      LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:>
 #  )
   if(MSVC)
-    set_property(TARGET H5_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
+    set_property(TARGET f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
   endif()
   set_target_properties (f90_ex_${example} PROPERTIES
       LINKER_LANGUAGE Fortran
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
index c74d2e0..07c3242 100644
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@@ -224,8 +224,8 @@ CLEAN_DATAFILES_AND_BLDDIR()
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-        $RM $BLDDIR/JUnit-interface.ert
-        $RM $BLDDIR/JUnit-interface.txt
+        $RM $BLDDIR/JUnit-*.ert
+        $RM $BLDDIR/JUnit-*.txt
     fi
 }
 
diff --git a/src/H5FS.c b/src/H5FS.c
index ec2dc11..e1a760f 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -1195,14 +1195,14 @@ H5FS_get_sect_count(const H5FS_t *frsp, hsize_t *tot_sect_count)
  *
  * Purpose:     Verify that the free space manager is mostly sane
  *
- * Return:      SUCCEED (Can't fail)
+ * Return:      void
  *
  * Programmer:  Quincey Koziol
  *              Jul 17 2006
  *
  *-------------------------------------------------------------------------
  */
-herr_t
+void
 H5FS__assert(const H5FS_t *fspace)
 {
     FUNC_ENTER_PACKAGE_NOERR
@@ -1228,7 +1228,7 @@ HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS__assert", fspace->
     HDassert(fspace->serial_sect_count > 0 || fspace->ghost_sect_count == 0);
 #endif /* QAK */
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
+    FUNC_LEAVE_NOAPI_VOID
 } /* end H5FS__assert() */
 #endif /* H5FS_DEBUG_ASSERT */
 
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h
index 23e1212..a5896ee 100644
--- a/src/H5FSpkg.h
+++ b/src/H5FSpkg.h
@@ -235,10 +235,10 @@ H5_DLL herr_t H5FS__hdr_dest(H5FS_t *hdr);
 H5_DLL herr_t H5FS_sinfo_dest(H5FS_sinfo_t *sinfo);
 
 /* Sanity check routines */
-#ifdef H5FS_DEBUG
-H5_DLL herr_t H5FS__assert(const H5FS_t *fspace);
-H5_DLL herr_t H5FS__sect_assert(const H5FS_t *fspace);
-#endif /* H5FS_DEBUG */
+#ifdef H5FS_DEBUG_ASSERT
+H5_DLL void H5FS__assert(const H5FS_t *fspace);
+H5_DLL void H5FS__sect_assert(const H5FS_t *fspace);
+#endif /* H5FS_DEBUG_ASSERT */
 
 /* Testing routines */
 #ifdef H5FS_TESTING
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index f0d9f47..11cd722 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -2197,14 +2197,14 @@ done:
  *
  * Purpose:     Verify that the sections managed are mostly sane
  *
- * Return:      SUCCEED/FAIL
+ * Return:      void
  *
  * Programmer:  Quincey Koziol
  *              Jul 17 2006
  *
  *-------------------------------------------------------------------------
  */
-herr_t
+void
 H5FS__sect_assert(const H5FS_t *fspace)
 {
     hsize_t separate_obj;       /* The number of separate objects managed */
@@ -2256,7 +2256,7 @@ HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS__sect_assert", fsp
                     size_t size_ghost_count;        /* # of ghost sections of this size */
 
                     /* Get section size node */
-                    fspace_node = H5SL_item(curr_size_node);
+                    fspace_node = (H5FS_node_t *)H5SL_item(curr_size_node);
 
                     /* Check sections on list */
                     curr_sect_node = H5SL_first(fspace_node->sect_list);
@@ -2267,7 +2267,7 @@ HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS__sect_assert", fsp
                         H5FS_section_info_t *sect;      /* Section */
 
                         /* Get section node & it's class */
-                        sect = H5SL_item(curr_sect_node);
+                        sect = (H5FS_section_info_t *)H5SL_item(curr_sect_node);
                         cls = &fspace->sect_cls[sect->type];
 #ifdef QAK
 HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H5FS__sect_assert", sect->size, sect->addr, sect->type);
@@ -2337,7 +2337,7 @@ HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H
     if(fspace->sinfo->merge_list)
         HDassert(fspace->tot_sect_count == (separate_obj + H5SL_count(fspace->sinfo->merge_list)));
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
+    FUNC_LEAVE_NOAPI_VOID
 } /* end H5FS__sect_assert() */
 #endif /* H5FS_DEBUG_ASSERT */