diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-06-23 21:21:57 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-06-23 21:21:57 (GMT) |
| commit | e2a75e4729a3301842e48dfac4aa3720c7544d9e (patch) | |
| tree | e203be975d85c55ffb2ab46845ccb89edb84c1cb /hl | |
| parent | f5416d3d2f45b1e670132ef85fde3909db3edb44 (diff) | |
| download | hdf5-e2a75e4729a3301842e48dfac4aa3720c7544d9e.zip hdf5-e2a75e4729a3301842e48dfac4aa3720c7544d9e.tar.gz hdf5-e2a75e4729a3301842e48dfac4aa3720c7544d9e.tar.bz2 | |
[svn-r17093] Description:
Allen fixed problem on Windows compilation by assigning to a variable
the functions H5Eget_auto2 and H5Eset_auto2 which fixes the problem of
having a function call in the middle of declaration statements.
Tested on: windows, smirom (icc, gcc, pgi), linew.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/src/H5HLprivate2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hl/src/H5HLprivate2.h b/hl/src/H5HLprivate2.h index b074f90..00d73e1 100644 --- a/hl/src/H5HLprivate2.h +++ b/hl/src/H5HLprivate2.h @@ -250,10 +250,10 @@ func \ ret_typ ret_value = ret_init; \ H5E_auto2_t efunc2; \ void *H5E_saved_edata; \ - (void)H5Eget_auto2(H5E_DEFAULT, &efunc2, &H5E_saved_edata); \ - (void)H5Eset_auto2(H5E_DEFAULT, NULL, NULL); \ H5_GLUE(FUNC_ERR_VAR_, use_err)(ret_typ, err) \ - H5_GLUE(FUNC_ENTER_, scope) + H5_GLUE(FUNC_ENTER_, scope) \ + herr_t err1 = H5Eget_auto2(H5E_DEFAULT, &efunc2, &H5E_saved_edata); \ + herr_t err2 = H5Eset_auto2(H5E_DEFAULT, NULL, NULL); /* Macros for label when a function initialization can fail */ #define H5_PRIV_YES_FUNC_INIT_FAILED func_init_failed: |