diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-08-15 21:20:18 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-08-15 21:20:18 (GMT) |
| commit | c638d93f3e660ce669a36e50a02473aac126953d (patch) | |
| tree | b39f5688adc827da7d000aaa5a5264d29c2ee919 /src/H5Tpkg.h | |
| parent | 8e7c24f5148e91335bf744583a6a407014014391 (diff) | |
| parent | e9305abf48426f265d7ec3ae54538e3ded8889ea (diff) | |
| download | hdf5-c638d93f3e660ce669a36e50a02473aac126953d.zip hdf5-c638d93f3e660ce669a36e50a02473aac126953d.tar.gz hdf5-c638d93f3e660ce669a36e50a02473aac126953d.tar.bz2 | |
Merge pull request #2770 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10
* commit 'e9305abf48426f265d7ec3ae54538e3ded8889ea':
Fixes missing chunk_info entry in CMake files
Even more normalization with develop
More normalizations with develop
Misc normalizations with develop
Normalization of perform directory with develop
Brings monotonic timer changes from develop
Brings Mirror VFD to 1.10 from develop
Brings splitter VFD from develop
Brings file locking changes from develop
Diffstat (limited to 'src/H5Tpkg.h')
| -rw-r--r-- | src/H5Tpkg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 05879ff..b8d2435 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -12,7 +12,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Programmer: Robb Matzke <matzke@llnl.gov> + * Programmer: Robb Matzke * Monday, December 8, 1997 * * Purpose: This file contains declarations which are visible only within @@ -146,7 +146,7 @@ struct H5T_stats_t { unsigned ncalls; /*num calls to conversion function */ hsize_t nelmts; /*total data points converted */ - H5_timer_t timer; /*total time for conversion */ + H5_timevals_t times; /*total time for conversion */ }; /* Library internal datatype conversion functions are... */ |