diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-06-24 22:37:20 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-06-24 22:37:20 (GMT) |
| commit | e9f476dad47ce593f13dacb77b1cc664d1f24e7b (patch) | |
| tree | c775d3e8a991a37373c0ec640d7a8c2e6b883b3c /src/H5Pocpl.c | |
| parent | 2ff00b1b937ebe36ac6ddf590c16a4c27fc0b053 (diff) | |
| parent | 25f80cbbec3a7d8036325784168b029cb71cc813 (diff) | |
| download | hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.zip hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.tar.gz hdf5-e9f476dad47ce593f13dacb77b1cc664d1f24e7b.tar.bz2 | |
Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop
* commit '25f80cbbec3a7d8036325784168b029cb71cc813': (324 commits)
Snapshot version 1.10 release 3 (snap3)
Update document
HDFFV-10433 Updated text to address issues raised.
Snapshot version 1.10 release 3 (snap2)
Updated version to 1.10.3-snap2
Merge corrections from develop
HDFFV-10473 add note for attribute fix
Correct attribute location
HDFFV-9739 and cmake improvements merge from develop
Fix for HDFFV-10469: set to latest format for virtual layout encoding.
Update Windows test machines
Fix soversion
Fixed libver bounds underscore issue
removed extraneous lib. ver. bound, PR comment
temporary fix for HDFFV-10469
Updated version to 1.10.3-snap1
Add new file
Correct number of tests
Whitespace and test reclassify merge from develop
HDFFV-10444 fix so numbers and merge java test changes
...
Diffstat (limited to 'src/H5Pocpl.c')
| -rw-r--r-- | src/H5Pocpl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index be41e32..b3c472e 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -90,7 +90,7 @@ static herr_t H5P__ocrt_reg_prop(H5P_genclass_t *pclass); /* Property callbacks */ -static herr_t H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size); +static herr_t H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size, void *udata); static herr_t H5P__ocrt_pipeline_dec(const void **_pp, void *value); static herr_t H5P__ocrt_pipeline_set(hid_t prop_id, const char *name, size_t size, void *value); static herr_t H5P__ocrt_pipeline_get(hid_t prop_id, const char *name, size_t size, void *value); @@ -1459,7 +1459,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size) +H5P__ocrt_pipeline_enc(const void *value, void **_pp, size_t *size, void H5_ATTR_UNUSED *udata) { const H5O_pline_t *pline = (const H5O_pline_t *)value; uint8_t **pp = (uint8_t **)_pp; |