diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-12-30 13:44:15 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-12-30 13:44:15 (GMT) |
| commit | 8215920678c09238ecc86d9eecc03a634f96d2d0 (patch) | |
| tree | 4012f77323e147b1883a77cb0f0a17605720a1c0 /src/H5Pdxpl.c | |
| parent | 5e26cd2d824ea05e5ae5ca3aebaa439a9b80e7fc (diff) | |
| parent | 0610c41c75920b145a144e62df142977b605fc97 (diff) | |
| download | hdf5-8215920678c09238ecc86d9eecc03a634f96d2d0.zip hdf5-8215920678c09238ecc86d9eecc03a634f96d2d0.tar.gz hdf5-8215920678c09238ecc86d9eecc03a634f96d2d0.tar.bz2 | |
Merge pull request #225 in HDFFV/hdf5 from develop_merge_cache_image_03 to develop
Merged incoming changes from cache_image.
* commit '0610c41c75920b145a144e62df142977b605fc97':
Bring support for doubly-linked list of all entries in cache from incoming cache image branch.
Align with name change of "user" ring in incoming cache image changes.
Refactor several cache clients to have only one copy of their deserialization code.
Diffstat (limited to 'src/H5Pdxpl.c')
| -rw-r--r-- | src/H5Pdxpl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index c094c20..4a3eb72 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -173,7 +173,7 @@ #define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF 0 /* Ring type - private property */ #define H5AC_XFER_RING_SIZE sizeof(unsigned) -#define H5AC_XFER_RING_DEF H5AC_RING_US +#define H5AC_XFER_RING_DEF H5AC_RING_USER #define H5AC_XFER_RING_ENC H5P__encode_unsigned #define H5AC_XFER_RING_DEC H5P__decode_unsigned #ifdef H5_DEBUG_BUILD |