diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-04 16:36:19 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 16:36:19 (GMT) |
commit | 13c706d851935894db86ade76ccbea532917fcf4 (patch) | |
tree | 0b2085cdcf0189058a8273af45951b9df2d1df36 /src/H5C.c | |
parent | 0f219cafeaa3d6755574c2fbd80292bbb513c130 (diff) | |
download | hdf5-13c706d851935894db86ade76ccbea532917fcf4.zip hdf5-13c706d851935894db86ade76ccbea532917fcf4.tar.gz hdf5-13c706d851935894db86ade76ccbea532917fcf4.tar.bz2 |
1 12 Merges from develop (#421)
* OESS-98 fix tools test for plugins
* sync fork
* Merge of changes from dev
* Move problem option to bottom of the list until fixed
* HDFFV-11106 - fix parsing optional args
* HDFFV-11106 add note
* grammer fix
* Whitespace after clang formatting
* Undo format version 11 changes
* Update check to working version
* Merge workflow and minor changes from develop
* Update supported platforms
* PR#3 merge from develop
* Merge gcc 10 diagnostics option from develop
* Merge #318 OSX changes from develop
* Merge serval small changes from dev
* fix typo
* Minor non-space formatting changes
* GH #386 copyright corrections for java folder
* revert because logic requires false return
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Remove case statement for H5I_EVENTSET
* Correct call with versioning
* Remove tabs
* Double underscore change
* Merges from develop
#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards
Diffstat (limited to 'src/H5C.c')
-rw-r--r-- | src/H5C.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2229,8 +2229,8 @@ H5C_protect(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *udata, unsign #ifdef H5_HAVE_PARALLEL hbool_t coll_access = FALSE; /* whether access to the cache entry is done collectively */ #endif /* H5_HAVE_PARALLEL */ - hbool_t write_permitted; - hbool_t was_loaded = FALSE; /* Whether the entry was loaded as a result of the protect */ + hbool_t write_permitted = FALSE; + hbool_t was_loaded = FALSE; /* Whether the entry was loaded as a result of the protect */ size_t empty_space; void * thing; H5C_cache_entry_t *entry_ptr; |