diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2012-06-20 15:27:37 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-06-20 15:27:37 (GMT) |
commit | 243942105f21773689d449606e1763740ef6cd61 (patch) | |
tree | d5e8f445aeddf795b3ba8b6aecabc68938b18ec7 /src/H5Cprivate.h | |
parent | b4c2be19afc2095b73a3c3f1fc37932cc08335db (diff) | |
download | hdf5-243942105f21773689d449606e1763740ef6cd61.zip hdf5-243942105f21773689d449606e1763740ef6cd61.tar.gz hdf5-243942105f21773689d449606e1763740ef6cd61.tar.bz2 |
[svn-r22480] Description:inactive/metadata_journaling
Bring changes from "trunk merging" branch back to this feature
branch, to make further work on the branch easier.
Tested on:
N/A - this branch is not compilable currently.
Diffstat (limited to 'src/H5Cprivate.h')
-rw-r--r-- | src/H5Cprivate.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index a6f2ae1..b35a221 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -32,7 +32,7 @@ #include "H5Cpublic.h" /* public prototypes */ -/* Pivate headers needed by this header */ +/* Private headers needed by this header */ #include "H5private.h" /* Generic Functions */ #include "H5Fprivate.h" /* File access */ @@ -60,7 +60,7 @@ /* H5C_COLLECT_CACHE_STATS controls overall collection of statistics * on cache activity. In general, this #define should be set to 0. */ -#define H5C_COLLECT_CACHE_STATS 1 +#define H5C_COLLECT_CACHE_STATS 0 /* H5C_COLLECT_CACHE_ENTRY_STATS controls collection of statistics * in individual cache entries. @@ -427,6 +427,7 @@ typedef void *(*H5C_deserialize_func_t)(const void *image_ptr, typedef herr_t (*H5C_image_len_func_t)(const void *thing, size_t *image_len_ptr); +#define H5C__SERIALIZE_NO_FLAGS_SET ((unsigned)0) #define H5C__SERIALIZE_RESIZED_FLAG ((unsigned)0x1) #define H5C__SERIALIZE_MOVED_FLAG ((unsigned)0x2) @@ -1393,8 +1394,6 @@ H5_DLL void H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr, H5_DLL herr_t H5C_dest(H5F_t * f, hid_t dxpl_id); -H5_DLL herr_t H5C_dest_empty(H5C_t * cache_ptr); - H5_DLL herr_t H5C_expunge_entry(H5F_t * f, hid_t dxpl_id, const H5C_class_t * type, |