diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-12-30 10:22:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-12-30 10:22:00 (GMT) |
| commit | e500f2d3dadd72281bf4f24cbba175c0ed77a3b0 (patch) | |
| tree | 89362838b4a09d0a660e8609c1421b9d709646ec /src | |
| parent | eecc0a26efe67c62485bd66e7c24e598e5ebadde (diff) | |
| download | hdf5-e500f2d3dadd72281bf4f24cbba175c0ed77a3b0.zip hdf5-e500f2d3dadd72281bf4f24cbba175c0ed77a3b0.tar.gz hdf5-e500f2d3dadd72281bf4f24cbba175c0ed77a3b0.tar.bz2 | |
Align with name change of "user" ring in incoming cache image changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5ACprivate.h | 2 | ||||
| -rw-r--r-- | src/H5Pdxpl.c | 2 | ||||
| -rw-r--r-- | src/H5SM.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index afd7817..07bb8fa 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -153,7 +153,7 @@ typedef enum { /* Aliases for the "ring" type and values */ typedef H5C_ring_t H5AC_ring_t; #define H5AC_RING_INV H5C_RING_UNDEFINED -#define H5AC_RING_US H5C_RING_USER +#define H5AC_RING_USER H5C_RING_USER #define H5AC_RING_FSM H5C_RING_FSM #define H5AC_RING_SBE H5C_RING_SBE #define H5AC_RING_SB H5C_RING_SB 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 @@ -144,7 +144,7 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d HDassert(!H5F_addr_defined(H5F_SOHM_ADDR(f))); /* Set the ring type in the DXPL */ - if(H5AC_set_ring(dxpl_id, H5AC_RING_US, &dxpl, &orig_ring) < 0) + if(H5AC_set_ring(dxpl_id, H5AC_RING_USER, &dxpl, &orig_ring) < 0) HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "unable to set ring value") /* Initialize master table */ @@ -2021,7 +2021,7 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id) cache_udata.f = f; /* Set the ring type in the DXPL */ - if(H5AC_set_ring(dxpl_id, H5AC_RING_US, &dxpl, &orig_ring) < 0) + if(H5AC_set_ring(dxpl_id, H5AC_RING_USER, &dxpl, &orig_ring) < 0) HGOTO_ERROR(H5E_SOHM, H5E_CANTSET, FAIL, "unable to set ring value") /* Read the rest of the SOHM table information from the cache */ |