diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2019-09-19 17:05:08 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2019-09-19 17:05:08 (GMT) |
| commit | e2be2824f932297c8acd5fb6270c7b6e01c48579 (patch) | |
| tree | 5719653bdbffc05e63afdcebc5da5ca61e577a1b /src/H5EAhdr.c | |
| parent | cf0fb665ac0083e79240d45b684f6c826ff1cb6b (diff) | |
| parent | 4d4a88a9f3775d1c6be820208a2699ae38d586b4 (diff) | |
| download | hdf5-e2be2824f932297c8acd5fb6270c7b6e01c48579.zip hdf5-e2be2824f932297c8acd5fb6270c7b6e01c48579.tar.gz hdf5-e2be2824f932297c8acd5fb6270c7b6e01c48579.tar.bz2 | |
Merge pull request #20 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10585-investigate-slowness-of-regular
* commit '4d4a88a9f3775d1c6be820208a2699ae38d586b4': (29 commits)
Fix for H5EA debug package when built in release mode.
Moved NDEBUG guards to H5EA_DEBUG in H5EA package.
Added MPICH_SKIP_MPICXX and OMPI_SKIP_CXX to H5public.h to avoid inadvertant linking to the deprecated MPI C++ wrappers. Fixes HDFFV-10893.
Added a release note for HDFFV-10892 (fcntl lock bug).
Fix segfault after H5VL_loc_params_t fix merge
HDFFV-10901 add missing config options
HDFFV-10854 add release note for windows
Fix get home dir for windows
Use variable for test output
Allow tests to dump output if not comparing
revert as CHECK will first check for exception
Clear exception for getting JNI string to clear the exception
Correct Windows check
revert windows change
Windows ssl headers are not in system loacation
Add include dirs and default lib for windows
Add policy to use <package>_ROOT
Add statement for label if code unimplemented
Update Windows require for CURL to CMake 3.13
Fix unused var
...
Diffstat (limited to 'src/H5EAhdr.c')
| -rw-r--r-- | src/H5EAhdr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5EAhdr.c b/src/H5EAhdr.c index ec40298..8a2e1d1 100644 --- a/src/H5EAhdr.c +++ b/src/H5EAhdr.c @@ -49,10 +49,10 @@ /* Local Macros */ /****************/ -#ifndef NDEBUG +#ifdef H5EA_DEBUG /* Max. # of bits for max. nelmts index */ #define H5EA_MAX_NELMTS_IDX_MAX 64 -#endif /* NDEBUG */ +#endif /* H5EA_DEBUG */ /* # of elements in a data block for a particular super block */ #define H5EA_SBLK_DBLK_NELMTS(s, m) \ @@ -366,7 +366,7 @@ H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata)) HDassert(f); HDassert(cparam); -#ifndef NDEBUG +#ifdef H5EA_DEBUG { unsigned sblk_idx; /* Super block index for first "actual" super block */ size_t dblk_nelmts; /* Number of data block elements */ @@ -398,7 +398,7 @@ H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata)) if(cparam->max_dblk_page_nelmts_bits > cparam->max_nelmts_bits) H5E_THROW(H5E_BADVALUE, "max. # of elements per data block page bits must be <= max. # of elements bits") } -#endif /* NDEBUG */ +#endif /* H5EA_DEBUG */ /* Allocate space for the shared information */ if(NULL == (hdr = H5EA__hdr_alloc(f))) @@ -724,7 +724,7 @@ H5EA__hdr_delete(H5EA_hdr_t *hdr)) HDassert(hdr); HDassert(!hdr->file_rc); -#ifndef NDEBUG +#ifdef H5EA_DEBUG { unsigned hdr_status = 0; /* Array header's status in the metadata cache */ @@ -736,7 +736,7 @@ H5EA__hdr_delete(H5EA_hdr_t *hdr)) HDassert(hdr_status & H5AC_ES__IN_CACHE); HDassert(hdr_status & H5AC_ES__IS_PROTECTED); } /* end block */ -#endif /* NDEBUG */ +#endif /* H5EA_DEBUG */ /* Check for index block */ if(H5F_addr_defined(hdr->idx_blk_addr)) { |