diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-13 02:53:33 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-13 02:53:33 (GMT) |
| commit | 32e30e06a2554ab549bb61a10c9e4b023741bee3 (patch) | |
| tree | f1b844c2e677246ee8fe2350580fb4727f56e5a9 /src/H5O.c | |
| parent | b3b06d2703eea051b0025c075f8c6742fcca1200 (diff) | |
| download | hdf5-32e30e06a2554ab549bb61a10c9e4b023741bee3.zip hdf5-32e30e06a2554ab549bb61a10c9e4b023741bee3.tar.gz hdf5-32e30e06a2554ab549bb61a10c9e4b023741bee3.tar.bz2 | |
[svn-r27766] Merge of r27292 from trunk:
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: koala
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 */ @@ -197,10 +200,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() */ |