diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-02-28 20:29:04 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-02-28 20:29:04 (GMT) |
| commit | 7f797174c7a013359e94d1aa5d6540a5629aa550 (patch) | |
| tree | 0320bfdb5418ab23978afbb1777539270f04c1f2 /src/H5Einit.h | |
| parent | 5eef94f83f4875b64ffe7f9cea05d965bddbd802 (diff) | |
| parent | 7eb65dbad45f473a953db595147b88d03f671658 (diff) | |
| download | hdf5-7f797174c7a013359e94d1aa5d6540a5629aa550.zip hdf5-7f797174c7a013359e94d1aa5d6540a5629aa550.tar.gz hdf5-7f797174c7a013359e94d1aa5d6540a5629aa550.tar.bz2 | |
Merge branch 'hdf5_1_10_5' into 1.10/master
Diffstat (limited to 'src/H5Einit.h')
| -rw-r--r-- | src/H5Einit.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/H5Einit.h b/src/H5Einit.h index ead5f67..713b2fb 100644 --- a/src/H5Einit.h +++ b/src/H5Einit.h @@ -697,9 +697,14 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to notify object about action") HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_CANTNOTIFY_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_LOGFAIL_g==(-1)); +assert(H5E_LOGGING_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "Failure in the cache logging framework"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_LOGGING_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_LOGFAIL_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "old H5E_LOGGING_g (maintained for binary compatibility)"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_LOGFAIL_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") assert(H5E_CANTCORK_g==(-1)); |