diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2017-02-28 16:43:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2017-02-28 16:43:38 (GMT) |
| commit | a49bd13da3feed72cc4e2650d71a224d0cbaad73 (patch) | |
| tree | f0b7da5910d5ce1525b9bf0a536042a8d425c4c6 /src/H5C.c | |
| parent | dfad2e1b079ca690ea144ff4a0fa006ea05ede3e (diff) | |
| parent | cf932610999de00867c0a0bb3a08ee3bbf39a158 (diff) | |
| download | hdf5-a49bd13da3feed72cc4e2650d71a224d0cbaad73.zip hdf5-a49bd13da3feed72cc4e2650d71a224d0cbaad73.tar.gz hdf5-a49bd13da3feed72cc4e2650d71a224d0cbaad73.tar.bz2 | |
Merge pull request #316 in HDFFV/hdf5 from merge_page_buffering_05 to develop
* commit 'cf932610999de00867c0a0bb3a08ee3bbf39a158':
Correct issues from pull request reviews.
Corrected version of 4b5e05c084f93c35dae946c2c9e814d565a613b0: Fix some more signed -> unsigned value issues with cache data structures, also misc. style cleanups. All to align w/incoming page_buffering changes.
Revert "Fix some more signed -> unsigned value issues with cache data structures, also"
Diffstat (limited to 'src/H5C.c')
| -rw-r--r-- | src/H5C.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1470,6 +1470,11 @@ H5C_insert_entry(H5F_t * f, entry_ptr->aux_next = NULL; entry_ptr->aux_prev = NULL; +#ifdef H5_HAVE_PARALLEL + entry_ptr->coll_next = NULL; + entry_ptr->coll_prev = NULL; +#endif /* H5_HAVE_PARALLEL */ + /* initialize cache image related fields */ entry_ptr->include_in_image = FALSE; entry_ptr->lru_rank = 0; @@ -1486,11 +1491,6 @@ H5C_insert_entry(H5F_t * f, entry_ptr->serialization_count = 0; #endif /* NDEBUG */ -#ifdef H5_HAVE_PARALLEL - entry_ptr->coll_next = NULL; - entry_ptr->coll_prev = NULL; -#endif /* H5_HAVE_PARALLEL */ - /* Apply tag to newly inserted entry */ if(H5C__tag_entry(cache_ptr, entry_ptr, dxpl_id) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "Cannot tag metadata entry") |