diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2012-01-04 16:46:15 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2012-01-04 16:46:15 (GMT) |
| commit | 86d0acc0c0f5c0c50dd634f6e23d4cae7b1debb1 (patch) | |
| tree | 0ffd3d980dfa5923699d6f76cd455ed5f7359dc3 /src/H5Oprivate.h | |
| parent | 58b4cd319d391cc0aed704abffd2f2b89f0eb3a0 (diff) | |
| parent | 7d0c15b7944577e94d02f7b4fb6a63977901adf0 (diff) | |
| download | hdf5-86d0acc0c0f5c0c50dd634f6e23d4cae7b1debb1.zip hdf5-86d0acc0c0f5c0c50dd634f6e23d4cae7b1debb1.tar.gz hdf5-86d0acc0c0f5c0c50dd634f6e23d4cae7b1debb1.tar.bz2 | |
[svn-r21863] Description:
Merged r21409 through r21862 from trunk to avoid_truncate branch.
Tested:
h5committested
Diffstat (limited to 'src/H5Oprivate.h')
| -rw-r--r-- | src/H5Oprivate.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 51e3b0f..aeed708 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -110,11 +110,13 @@ typedef struct H5O_t H5O_t; /* Set the fields in a shared message structure */ #define H5O_UPDATE_SHARED(SH_MESG, SH_TYPE, F, MSG_TYPE, CRT_IDX, OH_ADDR) \ - (SH_MESG)->type = (SH_TYPE); \ - (SH_MESG)->file = (F); \ - (SH_MESG)->msg_type_id = (MSG_TYPE); \ - (SH_MESG)->u.loc.index = (CRT_IDX); \ - (SH_MESG)->u.loc.oh_addr = (OH_ADDR); + { \ + (SH_MESG)->type = (SH_TYPE); \ + (SH_MESG)->file = (F); \ + (SH_MESG)->msg_type_id = (MSG_TYPE); \ + (SH_MESG)->u.loc.index = (CRT_IDX); \ + (SH_MESG)->u.loc.oh_addr = (OH_ADDR); \ + } /* end block */ /* Fractal heap ID type for shared message & attribute heap IDs. */ @@ -593,9 +595,14 @@ typedef struct H5O_fsinfo_t { typedef herr_t (*H5O_operator_t)(const void *mesg/*in*/, unsigned idx, void *operator_data/*in,out*/); +#ifdef OUT /* Typedef for "internal library" iteration operations */ typedef herr_t (*H5O_lib_operator_t)(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence, hbool_t *oh_modified/*out*/, void *operator_data/*in,out*/); +#endif +/* Typedef for "internal library" iteration operations */ +typedef herr_t (*H5O_lib_operator_t)(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, + unsigned sequence, unsigned *oh_modified/*out*/, void *operator_data/*in,out*/); /* Some syntactic sugar to make the compiler happy with two different kinds of iterator callbacks */ typedef enum H5O_mesg_operator_type_t { @@ -603,6 +610,9 @@ typedef enum H5O_mesg_operator_type_t { H5O_MESG_OP_LIB /* Library internal callback */ } H5O_mesg_operator_type_t; +#define H5O_MODIFY_CONDENSE 0x01 +#define H5O_MODIFY 0x02 + typedef struct { H5O_mesg_operator_type_t op_type; union { |