diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-08-13 18:15:55 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-08-13 18:15:55 (GMT) |
| commit | e42120c308b619e58f412e167f4449fd003f8ca9 (patch) | |
| tree | f052711815038c7be77792d9b0fad60e69a478e3 /src/H5trace.c | |
| parent | 7b8ffecc20ad383627ea2dbfa86aaebdf5f5b76b (diff) | |
| parent | aeb145428f5e6bc51742fff031b0cf8cf6fbefbb (diff) | |
| download | hdf5-e42120c308b619e58f412e167f4449fd003f8ca9.zip hdf5-e42120c308b619e58f412e167f4449fd003f8ca9.tar.gz hdf5-e42120c308b619e58f412e167f4449fd003f8ca9.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'aeb145428f5e6bc51742fff031b0cf8cf6fbefbb':
Updated h5trav.c to emit output that doesn't require ddl changes for map support.
Fixed Map API CMake option
Renamed H5Mdelete_key to H5Mdelete and H5Mset to H5Mput.
Added ifdef for intel compilers, __GNUC__ has to be defined for header files which use it to work with intel compilers. This gives a warning for intel compiler about fallthrough, so added a check not to include fallthrough if using intel compilers.
Added the map (H5M) API
Diffstat (limited to 'src/H5trace.c')
| -rw-r--r-- | src/H5trace.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index c5d14f5..de761f8 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -1359,6 +1359,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...) HDfprintf(out, "%ld (attr)", (long)obj); break; + case H5I_MAP: + HDfprintf(out, "%ld (map)", (long)obj); + break; + case H5I_VFL: HDfprintf(out, "%ld (file driver)", (long)obj); break; @@ -1544,6 +1548,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...) HDfprintf(out, "H5I_ATTR"); break; + case H5I_MAP: + HDfprintf(out, "H5I_MAP"); + break; + case H5I_VFL: HDfprintf(out, "H5I_VFL"); break; @@ -1799,8 +1807,12 @@ H5_trace(const double *returning, const char *func, const char *type, ...) HDfprintf(out, "H5O_TYPE_NAMED_DATATYPE"); break; + case H5O_TYPE_MAP: + HDfprintf(out, "H5O_TYPE_MAP"); + break; + case H5O_TYPE_NTYPES: - HDfprintf(out, "H5O_TYPE_TYPES"); + HDfprintf(out, "H5O_TYPE_NTYPES"); break; default: |