[svn-r6843] Purpose:

    Code cleanup

Description:
    Clean up warnings exposed by compiling on O2K.  Also, revert some of Bill
and my changes to the H5S_mpi_opt_types_g, etc. and settle them back into their
original location.

Platforms tested:
    h5committested.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/H5HP.c b/src/H5HP.c
index 325392a..d62bd4e 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -432,7 +432,8 @@ H5HP_count(const H5HP_t *heap)
     assert(heap->heap[0].obj==NULL);
 
     /* Return the number of objects in the heap */
-    ret_value=heap->nobjs;
+    H5_CHECK_OVERFLOW(heap->nobjs,size_t,ssize_t);
+    ret_value=(ssize_t)heap->nobjs;
 
 done:
     /* No post-condition check necessary, since heap is constant */