diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-01-29 13:51:29 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-01-29 13:51:29 (GMT) |
| commit | 61ab7b8bf3f15e31728ed5d4274a4e826f76ff7a (patch) | |
| tree | ec8d1f78ce20288e0151cda3393561ed34215329 /src/H5HFdblock.c | |
| parent | 821ce6874d9e2b322dda171f95901d5f68a1c26a (diff) | |
| download | hdf5-61ab7b8bf3f15e31728ed5d4274a4e826f76ff7a.zip hdf5-61ab7b8bf3f15e31728ed5d4274a4e826f76ff7a.tar.gz hdf5-61ab7b8bf3f15e31728ed5d4274a4e826f76ff7a.tar.bz2 | |
[svn-r29016] Merge of r28936, 28949, 28960-29009 from trunk.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial w/ Fortran and C++
autotools parallel (MPICH 3.1.4) w/ Fortran
CMake serial (3.3.2, via cmakehdf5)
Diffstat (limited to 'src/H5HFdblock.c')
| -rw-r--r-- | src/H5HFdblock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index 73db840..1272ab0 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -146,9 +146,7 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo /* XXX: Change to using free-list factories */ if((dblock->blk = H5FL_BLK_MALLOC(direct_block, dblock->size)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") -#ifdef H5_CLEAR_MEMORY -HDmemset(dblock->blk, 0, dblock->size); -#endif /* H5_CLEAR_MEMORY */ + HDmemset(dblock->blk, 0, dblock->size); dblock->write_buf = NULL; dblock->write_size = 0; |