[svn-r18042] Description:

	Bring r18039 from trunk to 1.8 branch:

	Minor code cleanups, to align better w/ongoing metadata journaling
convergence.

Tested on:
        Mac OS X/32 10.6.2 (amazon) w/debug
        (too minor to require h5committest)

1 files changed, 9 insertions, 10 deletions

diff --git a/src/H5HG.c b/src/H5HG.c
index 5578014..6f78469 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -99,6 +99,15 @@ static haddr_t H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size);
 /* Package Variables */
 /*********************/
 
+/* Declare a free list to manage the H5HG_t struct */
+H5FL_DEFINE(H5HG_heap_t);
+
+/* Declare a free list to manage sequences of H5HG_obj_t's */
+H5FL_SEQ_DEFINE(H5HG_obj_t);
+
+/* Declare a PQ free list to manage heap chunks */
+H5FL_BLK_DEFINE(gheap_chunk);
+
 
 /*****************************/
 /* Library Private Variables */
@@ -109,15 +118,6 @@ static haddr_t H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size);
 /* Local Variables */
 /*******************/
 
-/* Declare a free list to manage the H5HG_t struct */
-H5FL_DEFINE(H5HG_heap_t);
-
-/* Declare a free list to manage sequences of H5HG_obj_t's */
-H5FL_SEQ_DEFINE(H5HG_obj_t);
-
-/* Declare a PQ free list to manage heap chunks */
-H5FL_BLK_DEFINE(gheap_chunk);
-
 
 
 /*-------------------------------------------------------------------------
@@ -830,7 +830,6 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
          * The collection is empty. Remove it from the CWFS list and return it
          * to the file free list.
          */
-        H5_CHECK_OVERFLOW(heap->size, size_t, hsize_t);
         flags |= H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG; /* Indicate that the object was deleted, for the unprotect call */
     } /* end if */
     else {