diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-05 22:13:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 22:13:15 (GMT) |
| commit | 19b0ec7f17cd977238698fff0d21b1986dc27a54 (patch) | |
| tree | 0f59d7d8a866f8ccc142111535b7e7386ae223c5 /src/H5Epublic.h | |
| parent | 13c706d851935894db86ade76ccbea532917fcf4 (diff) | |
| download | hdf5-19b0ec7f17cd977238698fff0d21b1986dc27a54.zip hdf5-19b0ec7f17cd977238698fff0d21b1986dc27a54.tar.gz hdf5-19b0ec7f17cd977238698fff0d21b1986dc27a54.tar.bz2 | |
1 12 Merge #380 from develop (#438)
* 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
* Merge #380 from develop
* Correct date entry
Diffstat (limited to 'src/H5Epublic.h')
| -rw-r--r-- | src/H5Epublic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 839f324..9e53f54 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -124,10 +124,10 @@ H5_DLLVAR hid_t H5E_ERR_CLS_g; /* Use the Standard C __FILE__ & __LINE__ macros instead of typing them in */ /* And return after pushing error onto stack */ #define H5Epush_ret(func, cls, maj, min, str, ret) \ - { \ + do { \ H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, cls, maj, min, str); \ return (ret); \ - } + } while (0) /* Use the Standard C __FILE__ & __LINE__ macros instead of typing them in * And goto a label after pushing error onto stack. |