diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-02-17 16:46:52 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-02-25 19:59:52 (GMT) |
| commit | a3462bf164ef3b00e863de64a2a547c76f7adcd4 (patch) | |
| tree | c546f5f4ebddea0abc73b9623cab9a9471181a7d /src/H5Tprivate.h | |
| parent | 855dcfb5644f56106e87100a2f3af99bd8f11199 (diff) | |
| download | hdf5-a3462bf164ef3b00e863de64a2a547c76f7adcd4.zip hdf5-a3462bf164ef3b00e863de64a2a547c76f7adcd4.tar.gz hdf5-a3462bf164ef3b00e863de64a2a547c76f7adcd4.tar.bz2 | |
Merge pull request #2325 in HDFFV/hdf5 from ~DYOUNG/werror:h5t_copy to develop
Merged per discussion with Elena.
* commit '3f903a441ad84001ea66589728bd8b036b6fdfca':
Take out the temporary performance tests.
Make calls through a function pointer. Use the same number of arguments, always.
Increase iterations, provide a baseline for no-op, simplify the overhead case a bit.
Temporarily add some code that measures the time to run the simplest possible H5T__copy_all()-like routine 10 million times and then measures the version with FUNC_ENTER_STATIC/_LEAVE_NOAPI and a HGOTO_ERROR() statement.
H5T_copy() constification plus Quincey's contributions.
Diffstat (limited to 'src/H5Tprivate.h')
| -rw-r--r-- | src/H5Tprivate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index d8e98af..e05bb4e 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -59,7 +59,6 @@ struct H5S_t; typedef enum H5T_copy_t { H5T_COPY_TRANSIENT, H5T_COPY_ALL, - H5T_COPY_REOPEN } H5T_copy_t; /* Location of datatype information */ @@ -109,7 +108,8 @@ H5_DLLVAR H5T_order_t H5T_native_order_g; /* Private functions */ H5_DLL herr_t H5T_init(void); -H5_DLL H5T_t *H5T_copy(H5T_t *old_dt, H5T_copy_t method); +H5_DLL H5T_t *H5T_copy(const H5T_t *old_dt, H5T_copy_t method); +H5_DLL H5T_t *H5T_copy_reopen(H5T_t *old_dt); H5_DLL herr_t H5T_lock(H5T_t *dt, hbool_t immutable); H5_DLL herr_t H5T_close(H5T_t *dt); H5_DLL herr_t H5T_close_real(H5T_t *dt); @@ -164,7 +164,7 @@ H5_DLL herr_t H5T_update_shared(H5T_t *type); /* Field functions (for both compound & enumerated types) */ H5_DLL int H5T_get_nmembers(const H5T_t *dt); -H5_DLL H5T_t *H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method); +H5_DLL H5T_t *H5T_get_member_type(const H5T_t *dt, unsigned membno); H5_DLL size_t H5T_get_member_offset(const H5T_t *dt, unsigned membno); /* Atomic functions */ |