diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-03 08:48:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-03 08:48:50 (GMT) |
| commit | 3cd705e56e6ef13c3423df68bb12704d483409ae (patch) | |
| tree | f5010140d9de52c26e5d312532cfc64500988f24 /src/H5Pdcpl.c | |
| parent | 9d2178ab886ae957cfe11b6fe09f9e7f0e9ce369 (diff) | |
| download | hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.zip hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.tar.gz hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.tar.bz2 | |
[svn-r29612] Description:
Bring updated layout and EFL property comparisons and new "latest format"
flags from revise_chunks branch.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5Pdcpl.c')
| -rw-r--r-- | src/H5Pdcpl.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 8c9f792..0346f89 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -774,12 +774,6 @@ H5P__dcrt_layout_cmp(const void *_layout1, const void *_layout2, if(layout1->type > layout2->type) HGOTO_DONE(1) - /* Check for different layout version */ - if(layout1->version < layout2->version) - HGOTO_DONE(-1) - if(layout1->version > layout2->version) - HGOTO_DONE(1) - /* Compare non-dataset-specific fields in layout info */ switch(layout1->type) { case H5D_COMPACT: @@ -1651,14 +1645,6 @@ H5P__dcrt_ext_file_list_cmp(const void *_efl1, const void *_efl2, HDassert(efl2); HDassert(size == sizeof(H5O_efl_t)); - /* Check the heap address of external file lists */ - if(H5F_addr_defined(efl1->heap_addr) || H5F_addr_defined(efl2->heap_addr)) { - if(!H5F_addr_defined(efl1->heap_addr) && H5F_addr_defined(efl2->heap_addr)) HGOTO_DONE(-1); - if(H5F_addr_defined(efl1->heap_addr) && !H5F_addr_defined(efl2->heap_addr)) HGOTO_DONE(1); - if((cmp_value = H5F_addr_cmp(efl1->heap_addr, efl2->heap_addr)) != 0) - HGOTO_DONE(cmp_value); - } /* end if */ - /* Check the number of allocated efl entries */ if(efl1->nalloc < efl2->nalloc) HGOTO_DONE(-1); if(efl1->nalloc > efl2->nalloc) HGOTO_DONE(1); |