diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2020-05-20 15:57:20 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2020-05-20 15:57:20 (GMT) |
commit | 78931a0d83bc6447d123413604f76cc374aaeca0 (patch) | |
tree | 55563a74e915b7127ec65f9e11aaadf99925c779 /src/H5Oprivate.h | |
parent | d701855cc128336ef3a18b930634639b7133f24f (diff) | |
download | hdf5-78931a0d83bc6447d123413604f76cc374aaeca0.zip hdf5-78931a0d83bc6447d123413604f76cc374aaeca0.tar.gz hdf5-78931a0d83bc6447d123413604f76cc374aaeca0.tar.bz2 |
Brought the dsets test in line with develop. Brings over the fix
for 0-size dataset metadata allocation.
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r-- | src/H5Oprivate.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 08589c0..32df33f 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -120,7 +120,7 @@ typedef struct H5O_mesg_t H5O_mesg_t; /* If the module using this macro is allowed access to the private variables, access them directly */ #ifdef H5O_MODULE #define H5O_OH_GET_ADDR(O) ((O)->chunk[0].addr) -#define H5O_OH_GET_VERSION ((O)->version) +#define H5O_OH_GET_VERSION(O) ((O)->version) #define H5O_OH_GET_FLAGS(O) ((O)->flags) #define H5O_OH_GET_MTIME(O) ((O)->mtime) #else /* H5O_MODULE */ @@ -222,7 +222,7 @@ typedef struct H5O_copy_t { #define H5O_MDCI_MSG_ID 0x0018 /* Metadata Cache Image Message */ #define H5O_UNKNOWN_ID 0x0019 /* Placeholder message ID for unknown message. */ /* (this should never exist in a file) */ -/* +/* * Note: Must increment H5O_MSG_TYPES in H5Opkg.h and update H5O_msg_class_g * in H5O.c when creating a new message type. Also bump the value of * H5O_BOGUS_INVALID_ID, below, to be one greater than the value of @@ -481,7 +481,7 @@ typedef struct H5O_storage_chunk_t { const struct H5D_chunk_ops_t *ops; /* Pointer to chunked storage operations */ union { H5O_storage_chunk_btree_t btree; /* Information for v1 B-tree index */ - H5O_storage_chunk_bt2_t btree2; /* Information for v2 B-tree index */ + H5O_storage_chunk_bt2_t btree2; /* Information for v2 B-tree index */ H5O_storage_chunk_earray_t earray; /* Information for extensible array index */ H5O_storage_chunk_farray_t farray; /* Information for fixed array index */ H5O_storage_chunk_single_filt_t single; /* Information for single chunk w/ filters index */ @@ -582,8 +582,8 @@ typedef struct H5O_storage_t { typedef struct H5O_layout_chunk_farray_t { /* Creation parameters for fixed array data structure */ struct { - uint8_t max_dblk_page_nelmts_bits; /* Log2(Max. # of elements in a data block page) - - i.e. # of bits needed to store max. # of elements + uint8_t max_dblk_page_nelmts_bits; /* Log2(Max. # of elements in a data block page) - + i.e. # of bits needed to store max. # of elements in a data block page */ } cparam; } H5O_layout_chunk_farray_t; @@ -869,7 +869,6 @@ typedef struct { } u; } H5O_mesg_operator_t; - /* Typedef for abstract object creation */ typedef struct { H5O_type_t obj_type; /* Type of object to create */ @@ -877,6 +876,7 @@ typedef struct { void *new_obj; /* Pointer to new object created */ } H5O_obj_create_t; + /* Forward declarations for prototype arguments */ struct H5P_genplist_t; |