diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-27 05:51:04 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-27 05:51:04 (GMT) |
| commit | 58a95d0d4a593157bb7e77f71347ee50783a11a0 (patch) | |
| tree | 7a54c739616d9beabbbb8202ca0df568413ab040 /src/H5O.c | |
| parent | df8bd7ccd6cd8d50280a3a7d862064c6340e2169 (diff) | |
| download | hdf5-58a95d0d4a593157bb7e77f71347ee50783a11a0.zip hdf5-58a95d0d4a593157bb7e77f71347ee50783a11a0.tar.gz hdf5-58a95d0d4a593157bb7e77f71347ee50783a11a0.tar.bz2 | |
[svn-r27292] Description:
Bring 'fail if unknown always' object header message flag from the
avoid_truncate branch, strengthen error checking for unknown messages, and try
to catch object header code configurations at compile time (instead of runtime).
Tested on:
MacOSX/64 10.10.3 (amazon) w/serial & parallel
(h5committest forthcoming)
Diffstat (limited to 'src/H5O.c')
| -rw-r--r-- | src/H5O.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -44,6 +44,9 @@ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ #include "H5MFprivate.h" /* File memory management */ +#ifdef H5O_ENABLE_BOGUS +#include "H5MMprivate.h" /* Memory management */ +#endif /* H5O_ENABLE_BOGUS */ #include "H5Opkg.h" /* Object headers */ #include "H5SMprivate.h" /* Shared object header messages */ @@ -196,10 +199,10 @@ H5O_init_interface(void) FUNC_ENTER_NOAPI_NOINIT_NOERR /* H5O interface sanity checks */ - HDassert(H5O_MSG_TYPES == NELMTS(H5O_msg_class_g)); - HDassert(sizeof(H5O_fheap_id_t) == H5O_FHEAP_ID_LEN); + HDcompile_assert(H5O_MSG_TYPES == NELMTS(H5O_msg_class_g)); + HDcompile_assert(sizeof(H5O_fheap_id_t) == H5O_FHEAP_ID_LEN); - HDassert(H5O_UNKNOWN_ID < H5O_MSG_TYPES); + HDcompile_assert(H5O_UNKNOWN_ID < H5O_MSG_TYPES); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O_init_interface() */ |