Merge pull request #32 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:evict_on_close to evict_on_close

Sync with develop and cleaned up feature. Feature works with datasets but testing is minimal.

* commit '2646f917adb5b2e17404260e433dc3ed7c39a602': (102 commits)
  Cleaned up feature for dissemination to LLNL:     - Removed support for datatypes.     - Commented out support for groups     - General change clean-up     - Added a list of improvements to BRANCH.txt
  Removed blank line in Fortran file (leftover from last commit)
  Reverted H5T code since datatypes will not be supported at this time.
  Fixed format_convert and fortran files (bad merge?).
  Updated manifest. Was missing BRANCH.txt.
  Add missing command to set shared generated file
  Add default site names
  Separate fortran generation into static and shared folders.
  Revert to using old set command
  Change string to list - older usage
  Add option to submit to Cdash
  Change UPDATE_TYPE to git
  Update CMake java functions
  Added missing evict on close test file line to test/CMakeLists.txt.
  Restrict git commit hash in tar file names to first 7 characters with --short option.
  Add longer timeout to cache tests - test has consistently exceeded default timing.
  Removed -p option from invocation of autogen.sh by h5vers script to allow running h5vers on machines without /usr/hdf/bin/AUTOTOOLS.
  Add bin/pkgscrpts files to MANIFEST.
  dd bin/pkgscrpts directory with scripts to package deployed unix binaries into tarfiles.
  Purpose: Code cleanup Description:     - Used FP_EPSILON in comparing float values to verify read data     - Casted C macro to fix mismatched types in verify_val calls Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/H5FSstat.c b/src/H5FSstat.c
index d2c0177..3200849 100644
--- a/src/H5FSstat.c
+++ b/src/H5FSstat.c
@@ -96,7 +96,7 @@ H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
     stats->serial_sect_count = frsp->serial_sect_count;
     stats->ghost_sect_count = frsp->ghost_sect_count;
     stats->addr = frsp->addr;
-    stats->hdr_size = (size_t)H5FS_HEADER_SIZE(f);
+    stats->hdr_size = (hsize_t)H5FS_HEADER_SIZE(f);
     stats->sect_addr = frsp->sect_addr;
     stats->alloc_sect_size = frsp->alloc_sect_size;
     stats->sect_size = frsp->sect_size;