diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-14 13:43:41 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-14 13:43:41 (GMT) |
| commit | 1c3a9ffdd39a5f32acc0d1b536ca79c182d0d6da (patch) | |
| tree | f22e2591985e9b4c29592dce3dfe3891689ee210 /src/H5Pocpl.c | |
| parent | 799410812b9427b56915dee39c6dba80627bfb82 (diff) | |
| parent | d4c2e51d1e255fde2c0b2e359078cfd0de82720a (diff) | |
| download | hdf5-1c3a9ffdd39a5f32acc0d1b536ca79c182d0d6da.zip hdf5-1c3a9ffdd39a5f32acc0d1b536ca79c182d0d6da.tar.gz hdf5-1c3a9ffdd39a5f32acc0d1b536ca79c182d0d6da.tar.bz2 | |
[svn-r24711] merge from VOL branch to free up the H5V namespace.
Add H5I_VIEW ID type.
Diffstat (limited to 'src/H5Pocpl.c')
| -rw-r--r-- | src/H5Pocpl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index c5a6238..8d1d061 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -1512,7 +1512,7 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size) /* encode nused value */ enc_value = (uint64_t)pline->nused; - enc_size = H5V_limit_enc_size(enc_value); + enc_size = H5VM_limit_enc_size(enc_value); HDassert(enc_size < 256); *(*pp)++ = (uint8_t)enc_size; UINT64ENCODE_VAR(*pp, enc_value, enc_size); @@ -1542,7 +1542,7 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size) /* encode cd_nelmts */ enc_value = (uint64_t)pline->filter[u].cd_nelmts; - enc_size = H5V_limit_enc_size(enc_value); + enc_size = H5VM_limit_enc_size(enc_value); HDassert(enc_size < 256); *(*pp)++ = (uint8_t)enc_size; UINT64ENCODE_VAR(*pp, enc_value, enc_size); @@ -1555,12 +1555,12 @@ H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size) /* calculate size required for encoding */ *size += 1; - *size += (1 + H5V_limit_enc_size((uint64_t)pline->nused)); + *size += (1 + H5VM_limit_enc_size((uint64_t)pline->nused)); for(u = 0; u < pline->nused; u++) { *size += (sizeof(int32_t) + sizeof(unsigned) + 1); if(NULL != pline->filter[u].name) *size += H5Z_COMMON_NAME_LEN; - *size += (1 + H5V_limit_enc_size((uint64_t)pline->filter[u].cd_nelmts)); + *size += (1 + H5VM_limit_enc_size((uint64_t)pline->filter[u].cd_nelmts)); *size += pline->filter[u].cd_nelmts * sizeof(unsigned); } /* end for */ |