From dafcb4681247726d3a4d6eab2b4fcd2119e46e3a Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 21 Oct 2022 11:05:10 -0500 Subject: [PATCH 01/11] Removed the: file, func, line args in the _async APIs from the doxygen arguments. Documented H5ESclean. --- doxygen/Doxyfile.in | 1 + src/H5Apublic.h | 89 +++++++++++++++++++++++++++++++++++---------- src/H5Dpublic.h | 57 +++++++++++++++++++++-------- src/H5ESpublic.h | 17 +++++++++ src/H5Fpublic.h | 36 ++++++++++++++---- src/H5Gpublic.h | 59 ++++++++++++++++++++---------- src/H5Lpublic.h | 41 +++++++++++++++++---- src/H5Mpublic.h | 44 +++++++++++++++------- src/H5Opublic.h | 59 +++++++++++++++++++++--------- src/H5Rpublic.h | 21 ++++++++--- src/H5Tpublic.h | 24 +++++++++--- src/H5VLmodule.h | 3 +- 12 files changed, 334 insertions(+), 117 deletions(-) diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in index 393507c7ead..097e44bf8f5 100644 --- a/doxygen/Doxyfile.in +++ b/doxygen/Doxyfile.in @@ -2168,6 +2168,7 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = @DOXYGEN_PREDEFINED@ +PREDEFINED += H5_DOXYGEN # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 4ac6a535515..fb17cccfe82 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -94,8 +94,12 @@ H5_DLL herr_t H5Aclose(hid_t attr_id); * \ingroup ASYNC * \async_variant_of{H5Aclose} */ -H5_DLL herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, - hid_t es_id); +H5_DLL herr_t H5Aclose_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t attr_id,hid_t es_id); +#endif /* --------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -142,9 +146,13 @@ H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_ * \ingroup ASYNC * \async_variant_of{H5Acreate} */ -H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, - hid_t aapl_id, hid_t es_id); +H5_DLL hid_t H5Acreate_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id,const char *attr_name, hid_t type_id, hid_t space_id, + hid_t acpl_id, hid_t aapl_id, hid_t es_id); +#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -190,10 +198,14 @@ H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *a * \ingroup ASYNC * \async_variant_of{H5Acreate_by_name} */ -H5_DLL hid_t H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Acreate_by_name_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, hid_t es_id); +#endif /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -310,8 +322,12 @@ H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name); * \ingroup ASYNC * \async_variant_of{H5Aexists} */ -H5_DLL herr_t H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, - const char *attr_name, hbool_t *exists, hid_t es_id); +H5_DLL herr_t H5Aexists_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); +#endif /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -348,9 +364,13 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char * * \ingroup ASYNC * \async_variant_of{H5Aexists_by_name} */ -H5_DLL herr_t H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Aexists_by_name_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t *exists, hid_t lapl_id, hid_t es_id); +#endif /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -735,8 +755,12 @@ H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id); * \ingroup ASYNC * \async_variant_of{H5Aopen} */ -H5_DLL hid_t H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, - const char *attr_name, hid_t aapl_id, hid_t es_id); +H5_DLL hid_t H5Aopen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); +#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -785,9 +809,14 @@ H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_t * \ingroup ASYNC * \async_variant_of{H5Aopen_by_idx} */ -H5_DLL hid_t H5Aopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, +H5_DLL hid_t H5Aopen_by_idx_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id, hid_t es_id); +#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -834,9 +863,13 @@ H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *att * \ingroup ASYNC * \async_variant_of{H5Aopen_by_name} */ -H5_DLL hid_t H5Aopen_by_name_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Aopen_by_name_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); +#endif /*-------------------------------------------------------------------------- */ /** * \ingroup H5A @@ -873,8 +906,12 @@ H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf); * \ingroup ASYNC * \async_variant_of{H5Aread} */ -H5_DLL herr_t H5Aread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, - hid_t dtype_id, void *buf, hid_t es_id); +H5_DLL herr_t H5Aread_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); +#endif /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -902,16 +939,24 @@ H5_DLL herr_t H5Arename(hid_t loc_id, const char *old_name, const char *new_name * \ingroup ASYNC * \async_variant_of{H5Arename} */ -H5_DLL herr_t H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *old_name, const char *new_name, hid_t es_id); +H5_DLL herr_t H5Arename_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); +#endif /*--------------------------------------------------------------------------*/ /** * \ingroup ASYNC * \async_variant_of{H5Arename_by_name} */ -H5_DLL herr_t H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Arename_by_name_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id, hid_t es_id); +#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -946,8 +991,12 @@ H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); * \ingroup ASYNC * \async_variant_of{H5Awrite} */ -H5_DLL herr_t H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, - hid_t type_id, const void *buf, hid_t es_id); +H5_DLL herr_t H5Awrite_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); +#endif /*-------------------------------------------------------------------------*/ /** * \ingroup H5A diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 6fad1389036..8b6315f9e53 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -320,10 +320,14 @@ H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t spa * \ingroup ASYNC * \async_variant_of{H5Dcreate} */ -H5_DLL hid_t H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, +H5_DLL hid_t H5Dcreate_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t es_id); - +#endif /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -398,9 +402,12 @@ H5_DLL hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id); * \ingroup ASYNC * \async_variant_of{H5Dopen} */ -H5_DLL hid_t H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t dapl_id, hid_t es_id); - +H5_DLL hid_t H5Dopen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); +#endif /** * -------------------------------------------------------------------------- *\ingroup H5D @@ -432,9 +439,12 @@ H5_DLL hid_t H5Dget_space(hid_t dset_id); * \ingroup ASYNC * \async_variant_of{H5Dget_space} */ -H5_DLL hid_t H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, - hid_t es_id); - +H5_DLL hid_t H5Dget_space_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t dset_id, hid_t es_id); +#endif /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -855,10 +865,14 @@ H5_DLL herr_t H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_ * \ingroup ASYNC * \async_variant_of{H5Dread} */ -H5_DLL herr_t H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, +H5_DLL herr_t H5Dread_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf /*out*/, hid_t es_id); - +#endif /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -980,10 +994,14 @@ H5_DLL herr_t H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid * \ingroup ASYNC * \async_variant_of{H5Dwrite} */ -H5_DLL herr_t H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, +H5_DLL herr_t H5Dwrite_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, hid_t es_id); - +#endif /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -1268,9 +1286,12 @@ H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]); * \ingroup ASYNC * \async_variant_of{H5Dset_extent} */ -H5_DLL herr_t H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dset_extent_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t dset_id, const hsize_t size[], hid_t es_id); - +#endif /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -1447,8 +1468,12 @@ H5_DLL herr_t H5Dclose(hid_t dset_id); * \ingroup ASYNC * \async_variant_of{H5Dclose} */ -H5_DLL herr_t H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, - hid_t es_id); +H5_DLL herr_t H5Dclose_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t dset_id, hid_t es_id); +#endif /// \cond DEV /* Internal API routines */ H5_DLL herr_t H5Ddebug(hid_t dset_id); diff --git a/src/H5ESpublic.h b/src/H5ESpublic.h index 3aeb87298aa..d99554b8967 100644 --- a/src/H5ESpublic.h +++ b/src/H5ESpublic.h @@ -178,6 +178,23 @@ H5_DLL hid_t H5EScreate(void); * */ H5_DLL herr_t H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress, hbool_t *err_occurred); + +/** + * \ingroup H5ES + * + * \brief Attempt to cancel operations in an event set + * + * \es_id + * \param[out] count The number of events not canceled + * \param[out] err_occurred Status indicating if error is present in the event set + * \returns \herr_t + * + * \details H5ESget_count() attempts to cancel operations in an event set specified + * by \p es_id. H5ES_NONE is a valid value for \p es_id, but functions as a no-op. + * + * \since 1.13.0 + * + */ H5_DLL herr_t H5EScancel(hid_t es_id, size_t *num_not_canceled, hbool_t *err_occurred); /** diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 6559bfaead2..5b3ebe2aac3 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -357,8 +357,12 @@ H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_ * \ingroup ASYNC * \async_variant_of{H5Fcreate} */ -H5_DLL hid_t H5Fcreate_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Fcreate_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); +#endif /** * \ingroup H5F * @@ -457,8 +461,12 @@ H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id); * \ingroup ASYNC * \async_variant_of{H5Fopen} */ -H5_DLL hid_t H5Fopen_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Fopen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); +#endif /** * \ingroup H5F * @@ -490,8 +498,12 @@ H5_DLL hid_t H5Freopen(hid_t file_id); * \ingroup ASYNC * \async_variant_of{H5Freopen} */ -H5_DLL hid_t H5Freopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t file_id, - hid_t es_id); +H5_DLL hid_t H5Freopen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t file_id, hid_t es_id); +#endif /** * \ingroup H5F * @@ -530,8 +542,12 @@ H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); * \ingroup ASYNC * \async_variant_of{H5Fflush} */ -H5_DLL herr_t H5Fflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id, - H5F_scope_t scope, hid_t es_id); +H5_DLL herr_t H5Fflush_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t object_id, H5F_scope_t scope, hid_t es_id); +#endif /** * \ingroup H5F * @@ -581,8 +597,12 @@ H5_DLL herr_t H5Fclose(hid_t file_id); * \ingroup ASYNC * \async_variant_of{H5Fclose} */ -H5_DLL herr_t H5Fclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t file_id, - hid_t es_id); +H5_DLL herr_t H5Fclose_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t file_id, hid_t es_id); +#endif /** * \ingroup H5F * diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index c659a837682..04a1d9800a2 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -130,9 +130,13 @@ H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcp * \ingroup ASYNC * \async_variant_of{H5Gcreate} */ -H5_DLL hid_t H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, +H5_DLL hid_t H5Gcreate_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); - +#endif /** *------------------------------------------------------------------------- * \ingroup H5G @@ -217,9 +221,12 @@ H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id); * \ingroup ASYNC * \async_variant_of{H5Gopen} */ -H5_DLL hid_t H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t gapl_id, hid_t es_id); - +H5_DLL hid_t H5Gopen( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5G @@ -276,9 +283,12 @@ H5_DLL herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo); * \ingroup ASYNC * \async_variant_of{H5Gget_info} */ -H5_DLL herr_t H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - H5G_info_t *ginfo /*out*/, hid_t es_id); - +H5_DLL herr_t H5Gget_info( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5G @@ -318,10 +328,13 @@ H5_DLL herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *gi * \ingroup ASYNC * \async_variant_of{H5Gget_info_by_name} */ -H5_DLL herr_t H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned app_line, - hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, - hid_t lapl_id, hid_t es_id); - +H5_DLL herr_t H5Gget_info_by_name( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, + hid_t lapl_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5G @@ -375,11 +388,14 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_ * \ingroup ASYNC * \async_variant_of{H5Gget_info_by_idx} */ -H5_DLL herr_t H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, - hid_t loc_id, const char *group_name, H5_index_t idx_type, - H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, - hid_t lapl_id, hid_t es_id); - +H5_DLL herr_t H5Gget_info_by_idx( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *group_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, + hid_t lapl_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5G @@ -464,9 +480,12 @@ H5_DLL herr_t H5Gclose(hid_t group_id); * \ingroup ASYNC * \async_variant_of{H5Gclose} */ -H5_DLL herr_t H5Gclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t group_id, - hid_t es_id); - +H5_DLL herr_t H5Gclose( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t group_id, hid_t es_id); +#endif /// \cond DEV /* API Wrappers for async routines */ /* (Must be defined _after_ the function prototype) */ diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index ca5f6e6b360..dc15b1aea63 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -294,9 +294,13 @@ H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, * \ingroup ASYNC * \async_variant_of{H5Lcreate_hard} */ -H5_DLL herr_t H5Lcreate_hard_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Lcreate_hard_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); +#endif /** * \ingroup H5L * @@ -366,9 +370,13 @@ H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const c * \ingroup ASYNC * \async_variant_of{H5Lcreate_soft} */ -H5_DLL herr_t H5Lcreate_soft_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Lcreate_soft_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); +#endif /** * \ingroup H5L * @@ -411,8 +419,12 @@ H5_DLL herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id); * \ingroup ASYNC * \async_variant_of{H5Ldelete} */ -H5_DLL herr_t H5Ldelete_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t lapl_id, hid_t es_id); +H5_DLL herr_t H5Ldelete_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); +#endif /** * \ingroup H5L * @@ -446,9 +458,13 @@ H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t * \ingroup ASYNC * \async_variant_of{H5Ldelete_by_idx} */ -H5_DLL herr_t H5Ldelete_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Ldelete_by_idx_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); +#endif /** * \ingroup H5L * @@ -652,8 +668,12 @@ H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id); * \ingroup ASYNC * \async_variant_of{H5Lexists} */ -H5_DLL herr_t H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); +H5_DLL herr_t H5Lexists_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); +#endif /** * \ingroup H5L * @@ -903,9 +923,14 @@ H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t ord * \ingroup ASYNC * \async_variant_of{H5Literate} */ -H5_DLL herr_t H5Literate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t group_id, +H5_DLL herr_t H5Literate_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, void *op_data, hid_t es_id); +#endif /** * \ingroup TRAV * diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 0d6b1b211e2..1b0383718b9 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -226,10 +226,13 @@ H5_DLL hid_t H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t * \ingroup ASYNC * \async_variant_of{H5Mcreate} */ -H5_DLL hid_t H5Mcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, +H5_DLL hid_t H5Mcreate_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id, hid_t es_id); - +#endif /** * \ingroup H5M * @@ -266,9 +269,12 @@ H5_DLL hid_t H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id); * \ingroup ASYNC * \async_variant_of{H5Mopen} */ -H5_DLL hid_t H5Mopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t mapl_id, hid_t es_id); - +H5_DLL hid_t H5Mopen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); +#endif /** * \ingroup H5M * @@ -292,9 +298,12 @@ H5_DLL herr_t H5Mclose(hid_t map_id); * \ingroup ASYNC * \async_variant_of{H5Mclose} */ -H5_DLL herr_t H5Mclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, - hid_t es_id); - +H5_DLL herr_t H5Mclose_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t map_id,hid_t es_id); +#endif /** * \ingroup H5M * @@ -414,10 +423,14 @@ H5_DLL herr_t H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t * \ingroup ASYNC * \async_variant_of{H5Mput} */ -H5_DLL herr_t H5Mput_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, +H5_DLL herr_t H5Mput_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id, hid_t es_id); - +#endif /** * \ingroup H5M * @@ -455,10 +468,13 @@ H5_DLL herr_t H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t * \ingroup ASYNC * \async_variant_of{H5Mget} */ -H5_DLL herr_t H5Mget_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, - hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, +H5_DLL herr_t H5Mget_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, hid_t es_id); - +#endif /** * \ingroup H5M * diff --git a/src/H5Opublic.h b/src/H5Opublic.h index a6cea3919ba..1577c16f72e 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -274,9 +274,12 @@ H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id); * \ingroup ASYNC * \async_variant_of{H5Oopen} */ -H5_DLL hid_t H5Oopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t lapl_id, hid_t es_id); - +H5_DLL hid_t H5Oopen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -358,10 +361,13 @@ H5_DLL hid_t H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx * \ingroup ASYNC * \async_variant_of{H5Oopen_by_idx} */ -H5_DLL hid_t H5Oopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *group_name, H5_index_t idx_type, H5_iter_order_t order, +H5_DLL hid_t H5Oopen_by_idx_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); - +#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -540,9 +546,13 @@ H5_DLL herr_t H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t * * \ingroup ASYNC * \async_variant_of{H5Oget_info_by_name} */ -H5_DLL herr_t H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Oget_info_by_name_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- @@ -927,10 +937,13 @@ H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, * \ingroup ASYNC * \async_variant_of{H5Ocopy} */ -H5_DLL herr_t H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid_t src_loc_id, - const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, +H5_DLL herr_t H5Ocopy_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t es_id); - +#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1335,9 +1348,12 @@ H5_DLL herr_t H5Oclose(hid_t object_id); * \ingroup ASYNC * \async_variant_of{H5Oclose} */ -H5_DLL herr_t H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id, - hid_t es_id); - +H5_DLL herr_t H5Oclose_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t object_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1375,8 +1391,12 @@ H5_DLL herr_t H5Oflush(hid_t obj_id); * \ingroup ASYNC * \async_variant_of{H5Oflush} */ -H5_DLL herr_t H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, - hid_t es_id); +H5_DLL herr_t H5Oflush_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t obj_id, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1407,9 +1427,12 @@ H5_DLL herr_t H5Orefresh(hid_t oid); * \ingroup ASYNC * \async_variant_of{H5Orefresh} */ -H5_DLL herr_t H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line, hid_t oid, - hid_t es_id); - +H5_DLL herr_t H5Orefresh_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t oid, hid_t es_id); +#endif /** *------------------------------------------------------------------------- * \ingroup H5O diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index ef798ea0bce..666d703cccb 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -348,9 +348,12 @@ H5_DLL hid_t H5Ropen_object(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); * \ingroup ASYNC * \async_variant_of{H5Ropen} */ -H5_DLL hid_t H5Ropen_object_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Ropen_object_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); - +#endif /** * -------------------------------------------------------------------------- * \ingroup H5R @@ -389,9 +392,12 @@ H5_DLL hid_t H5Ropen_region(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); * \ingroup ASYNC * \async_variant_of{H5Ropen_region} */ -H5_DLL hid_t H5Ropen_region_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Ropen_region_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); - +#endif /** * -------------------------------------------------------------------------- * \ingroup H5R @@ -427,9 +433,12 @@ H5_DLL hid_t H5Ropen_attr(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id); * \ingroup ASYNC * \async_variant_of{H5Ropen_attr} */ -H5_DLL hid_t H5Ropen_attr_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Ropen_attr_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); - +#endif /* Get type */ /** diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index d1ec2bdeb75..949eddfdea5 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -1095,8 +1095,12 @@ H5_DLL herr_t H5Tclose(hid_t type_id); * \brief Asynchronous version of H5Tclose(). * */ -H5_DLL herr_t H5Tclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t type_id, - hid_t es_id); +H5_DLL herr_t H5Tclose_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, +#else + unsigned app_line, hid_t type_id, hid_t es_id); +#endif /** * \ingroup H5T * @@ -1185,9 +1189,13 @@ H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lc * \brief Asynchronous version of H5Tcommit2(). * */ -H5_DLL herr_t H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, +H5_DLL herr_t H5Tcommit_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); +#endif /** * -------------------------------------------------------------------------- * \ingroup H5T @@ -1218,8 +1226,12 @@ H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id); * \brief Asynchronous version of H5Topen2(). * */ -H5_DLL hid_t H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hid_t tapl_id, hid_t es_id); +H5_DLL hid_t H5Topen_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#else + hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); +#endif /** * \ingroup H5T * diff --git a/src/H5VLmodule.h b/src/H5VLmodule.h index 5e2e1b35a64..95f820c723b 100644 --- a/src/H5VLmodule.h +++ b/src/H5VLmodule.h @@ -121,7 +121,8 @@ * \todo Describe the VOL plugin life cycle. * * \defgroup ASYNC Asynchronous Functions - * \brief Asynchronous Functions + * \brief List of the asynchronous functions. + * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for context. * * \defgroup H5VLDEF Definitions * \ingroup H5VL From 7019fc67e16d0c9bcf6196f163cf18b1ee169ab5 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Fri, 21 Oct 2022 11:19:16 -0500 Subject: [PATCH 02/11] format fixes --- src/H5Apublic.h | 36 ++++++++++++++++-------------------- src/H5Dpublic.h | 23 ++++++++++------------- src/H5Fpublic.h | 10 +++++----- src/H5Gpublic.h | 17 +++++++---------- src/H5Lpublic.h | 21 ++++++++++----------- src/H5Mpublic.h | 17 ++++++++--------- src/H5Opublic.h | 19 +++++++++---------- src/H5Rpublic.h | 6 +++--- src/H5Tpublic.h | 7 +++---- src/H5VLmodule.h | 3 ++- 10 files changed, 73 insertions(+), 86 deletions(-) diff --git a/src/H5Apublic.h b/src/H5Apublic.h index fb17cccfe82..fa83ffbe80c 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -98,7 +98,7 @@ H5_DLL herr_t H5Aclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t attr_id,hid_t es_id); + hid_t attr_id, hid_t es_id); #endif /* --------------------------------------------------------------------------*/ /** @@ -150,8 +150,8 @@ H5_DLL hid_t H5Acreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id,const char *attr_name, hid_t type_id, hid_t space_id, - hid_t acpl_id, hid_t aapl_id, hid_t es_id); + hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, + hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -202,9 +202,8 @@ H5_DLL hid_t H5Acreate_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, - hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, - hid_t es_id); + hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, + hid_t aapl_id, hid_t lapl_id, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ /** @@ -326,7 +325,7 @@ H5_DLL herr_t H5Aexists_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); + hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ /** @@ -368,8 +367,7 @@ H5_DLL herr_t H5Aexists_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *obj_name, const char *attr_name, - hbool_t *exists, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t *exists, hid_t lapl_id, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ /** @@ -759,7 +757,7 @@ H5_DLL hid_t H5Aopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); + hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -813,9 +811,8 @@ H5_DLL hid_t H5Aopen_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, - const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, - hid_t aapl_id, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, + hid_t lapl_id, hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -867,8 +864,7 @@ H5_DLL hid_t H5Aopen_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, - hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); #endif /*-------------------------------------------------------------------------- */ /** @@ -910,7 +906,7 @@ H5_DLL herr_t H5Aread_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); + hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ /** @@ -943,7 +939,7 @@ H5_DLL herr_t H5Arename_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); + hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -954,8 +950,8 @@ H5_DLL herr_t H5Arename_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *obj_name, const char *old_attr_name, - const char *new_attr_name, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id, + hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -995,7 +991,7 @@ H5_DLL herr_t H5Awrite_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); + hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ /** diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 8b6315f9e53..07949fcdf92 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -324,9 +324,8 @@ H5_DLL hid_t H5Dcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, - const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, - hid_t dapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, + hid_t dapl_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -406,7 +405,7 @@ H5_DLL hid_t H5Dopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -443,7 +442,7 @@ H5_DLL hid_t H5Dget_space_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t dset_id, hid_t es_id); + hid_t dset_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -869,9 +868,8 @@ H5_DLL herr_t H5Dread_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t dset_id, - hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, - void *buf /*out*/, hid_t es_id); + hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, + void *buf /*out*/, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -998,9 +996,8 @@ H5_DLL herr_t H5Dwrite_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t dset_id, - hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, - const void *buf, hid_t es_id); + hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, + hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -1290,7 +1287,7 @@ H5_DLL herr_t H5Dset_extent_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t dset_id, const hsize_t size[], hid_t es_id); + hid_t dset_id, const hsize_t size[], hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -1472,7 +1469,7 @@ H5_DLL herr_t H5Dclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t dset_id, hid_t es_id); + hid_t dset_id, hid_t es_id); #endif /// \cond DEV /* Internal API routines */ diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 5b3ebe2aac3..e842ca2649b 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -361,7 +361,7 @@ H5_DLL hid_t H5Fcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); + const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); #endif /** * \ingroup H5F @@ -465,7 +465,7 @@ H5_DLL hid_t H5Fopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); + const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); #endif /** * \ingroup H5F @@ -502,7 +502,7 @@ H5_DLL hid_t H5Freopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t file_id, hid_t es_id); + hid_t file_id, hid_t es_id); #endif /** * \ingroup H5F @@ -546,7 +546,7 @@ H5_DLL herr_t H5Fflush_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t object_id, H5F_scope_t scope, hid_t es_id); + hid_t object_id, H5F_scope_t scope, hid_t es_id); #endif /** * \ingroup H5F @@ -601,7 +601,7 @@ H5_DLL herr_t H5Fclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t file_id, hid_t es_id); + hid_t file_id, hid_t es_id); #endif /** * \ingroup H5F diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 04a1d9800a2..1c994622e6e 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -134,8 +134,7 @@ H5_DLL hid_t H5Gcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, - const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -225,7 +224,7 @@ H5_DLL hid_t H5Gopen( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -287,7 +286,7 @@ H5_DLL herr_t H5Gget_info( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); + hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -332,8 +331,7 @@ H5_DLL herr_t H5Gget_info_by_name( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, - hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -392,9 +390,8 @@ H5_DLL herr_t H5Gget_info_by_idx( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *group_name, H5_index_t idx_type, - H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, - hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, + H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -484,7 +481,7 @@ H5_DLL herr_t H5Gclose( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t group_id, hid_t es_id); + hid_t group_id, hid_t es_id); #endif /// \cond DEV /* API Wrappers for async routines */ diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index dc15b1aea63..400c9c2fda5 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -298,8 +298,8 @@ H5_DLL herr_t H5Lcreate_hard_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, - const char *new_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); + hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, + hid_t lapl_id, hid_t es_id); #endif /** * \ingroup H5L @@ -374,8 +374,8 @@ H5_DLL herr_t H5Lcreate_soft_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - const char *link_target, hid_t link_loc_id, const char *link_name, - hid_t lcpl_id, hid_t lapl_id, hid_t es_id); + const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, + hid_t es_id); #endif /** * \ingroup H5L @@ -423,7 +423,7 @@ H5_DLL herr_t H5Ldelete_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif /** * \ingroup H5L @@ -462,8 +462,8 @@ H5_DLL herr_t H5Ldelete_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *group_name, H5_index_t idx_type, - H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, + hid_t lapl_id, hid_t es_id); #endif /** * \ingroup H5L @@ -672,7 +672,7 @@ H5_DLL herr_t H5Lexists_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); #endif /** * \ingroup H5L @@ -927,9 +927,8 @@ H5_DLL herr_t H5Literate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t group_id, - H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, - void *op_data, hid_t es_id); + hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, + void *op_data, hid_t es_id); #endif /** * \ingroup TRAV diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 1b0383718b9..55cab3cfbef 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -230,8 +230,8 @@ H5_DLL hid_t H5Mcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, - hid_t mcpl_id, hid_t mapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, + hid_t mapl_id, hid_t es_id); #endif /** * \ingroup H5M @@ -273,7 +273,7 @@ H5_DLL hid_t H5Mopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); #endif /** * \ingroup H5M @@ -302,7 +302,7 @@ H5_DLL herr_t H5Mclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t map_id,hid_t es_id); + hid_t map_id, hid_t es_id); #endif /** * \ingroup H5M @@ -427,9 +427,8 @@ H5_DLL herr_t H5Mput_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t map_id, - hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, - hid_t dxpl_id, hid_t es_id); + hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, + hid_t dxpl_id, hid_t es_id); #endif /** * \ingroup H5M @@ -472,8 +471,8 @@ H5_DLL herr_t H5Mget_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, - hid_t dxpl_id, hid_t es_id); + hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, + hid_t es_id); #endif /** * \ingroup H5M diff --git a/src/H5Opublic.h b/src/H5Opublic.h index 1577c16f72e..7bdf9215e9c 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -278,7 +278,7 @@ H5_DLL hid_t H5Oopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -365,8 +365,8 @@ H5_DLL hid_t H5Oopen_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, - hsize_t n, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, + hid_t lapl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -550,8 +550,7 @@ H5_DLL herr_t H5Oget_info_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, - unsigned fields, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, hid_t es_id); #endif /** @@ -941,8 +940,8 @@ H5_DLL herr_t H5Ocopy_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, - hid_t lcpl_id, hid_t es_id); + hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, + hid_t lcpl_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -1352,7 +1351,7 @@ H5_DLL herr_t H5Oclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t object_id, hid_t es_id); + hid_t object_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -1395,7 +1394,7 @@ H5_DLL herr_t H5Oflush_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t obj_id, hid_t es_id); + hid_t obj_id, hid_t es_id); #endif /** *------------------------------------------------------------------------- @@ -1431,7 +1430,7 @@ H5_DLL herr_t H5Orefresh_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t oid, hid_t es_id); + hid_t oid, hid_t es_id); #endif /** *------------------------------------------------------------------------- diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index 666d703cccb..f43b1038130 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -352,7 +352,7 @@ H5_DLL hid_t H5Ropen_object_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -396,7 +396,7 @@ H5_DLL hid_t H5Ropen_region_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -437,7 +437,7 @@ H5_DLL hid_t H5Ropen_attr_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); #endif /* Get type */ diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index 949eddfdea5..7a0dcb83420 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -1099,7 +1099,7 @@ H5_DLL herr_t H5Tclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, #else - unsigned app_line, hid_t type_id, hid_t es_id); + unsigned app_line, hid_t type_id, hid_t es_id); #endif /** * \ingroup H5T @@ -1193,8 +1193,7 @@ H5_DLL herr_t H5Tcommit_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, - hid_t es_id); + hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -1230,7 +1229,7 @@ H5_DLL hid_t H5Topen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, #else - hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); + hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); #endif /** * \ingroup H5T diff --git a/src/H5VLmodule.h b/src/H5VLmodule.h index 95f820c723b..374ffec2bd2 100644 --- a/src/H5VLmodule.h +++ b/src/H5VLmodule.h @@ -122,7 +122,8 @@ * * \defgroup ASYNC Asynchronous Functions * \brief List of the asynchronous functions. - * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for context. + * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for + *context. * * \defgroup H5VLDEF Definitions * \ingroup H5VL From f890bf10f1c0653a2e4d8c106a8f9f145985d953 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 21 Oct 2022 11:25:13 -0500 Subject: [PATCH 03/11] fixed DOXYGEN_PREDEFINED --- configure.ac | 2 +- doxygen/CMakeLists.txt | 2 +- doxygen/Doxyfile.in | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d66d47392c8..97af016ea95 100644 --- a/configure.ac +++ b/configure.ac @@ -1260,7 +1260,7 @@ if test "X$HDF5_DOXYGEN" = "Xyes"; then DOXYGEN_SEARCHENGINE_URL= DOXYGEN_STRIP_FROM_PATH='$(SRCDIR)' DOXYGEN_STRIP_FROM_INC_PATH='$(SRCDIR)' - DOXYGEN_PREDEFINED='H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN_FORTRAN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD' + DOXYGEN_PREDEFINED='H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_DOXYGEN_FORTRAN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD' DX_INIT_DOXYGEN([HDF5], [./doxygen/Doxyfile], [hdf5lib_docs]) fi diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt index 86d34a310dc..7589ff4ca37 100644 --- a/doxygen/CMakeLists.txt +++ b/doxygen/CMakeLists.txt @@ -29,7 +29,7 @@ if (DOXYGEN_FOUND) set (DOXYGEN_SEARCHENGINE_URL) set (DOXYGEN_STRIP_FROM_PATH ${HDF5_SOURCE_DIR}) set (DOXYGEN_STRIP_FROM_INC_PATH ${HDF5_SOURCE_DIR}) - set (DOXYGEN_PREDEFINED "H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN_FORTRAN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD") + set (DOXYGEN_PREDEFINED "H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_DOXYGEN_FORTRAN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD") # This configure and individual custom targets work together # Replace variables inside @@ with the current values diff --git a/doxygen/Doxyfile.in b/doxygen/Doxyfile.in index 097e44bf8f5..393507c7ead 100644 --- a/doxygen/Doxyfile.in +++ b/doxygen/Doxyfile.in @@ -2168,7 +2168,6 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = @DOXYGEN_PREDEFINED@ -PREDEFINED += H5_DOXYGEN # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The From 9cc9c80f5fb47c0c0898a5318deefc0d1f9ea404 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 21 Oct 2022 12:17:59 -0500 Subject: [PATCH 04/11] Fixed the #ifdet logic for doxygen, added missing multi-dataset va_args --- src/H5Apublic.h | 36 +++++++++------------------ src/H5Dpublic.h | 65 ++++++++++++++++++++++++++----------------------- src/H5Fpublic.h | 15 ++++-------- src/H5Gpublic.h | 28 +++++++++------------ src/H5Lpublic.h | 18 +++++--------- src/H5Mpublic.h | 15 ++++-------- src/H5Opublic.h | 21 ++++++---------- src/H5Rpublic.h | 9 +++---- src/H5Tpublic.h | 9 +++---- 9 files changed, 86 insertions(+), 130 deletions(-) diff --git a/src/H5Apublic.h b/src/H5Apublic.h index fa83ffbe80c..ee5f5716c10 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -97,9 +97,8 @@ H5_DLL herr_t H5Aclose(hid_t attr_id); H5_DLL herr_t H5Aclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t attr_id, hid_t es_id); #endif + hid_t attr_id, hid_t es_id); /* --------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -149,10 +148,9 @@ H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_ H5_DLL hid_t H5Acreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t es_id); -#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -201,10 +199,9 @@ H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *a H5_DLL hid_t H5Acreate_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, hid_t es_id); -#endif /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -324,9 +321,8 @@ H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name); H5_DLL herr_t H5Aexists_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); #endif + hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -366,9 +362,8 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char * H5_DLL herr_t H5Aexists_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t *exists, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t *exists, hid_t lapl_id, hid_t es_id); /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -756,9 +751,8 @@ H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id); H5_DLL hid_t H5Aopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); #endif + hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -810,10 +804,9 @@ H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_t H5_DLL hid_t H5Aopen_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id, hid_t es_id); -#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -863,9 +856,8 @@ H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *att H5_DLL hid_t H5Aopen_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); /*-------------------------------------------------------------------------- */ /** * \ingroup H5A @@ -905,9 +897,8 @@ H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf); H5_DLL herr_t H5Aread_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); #endif + hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -938,9 +929,8 @@ H5_DLL herr_t H5Arename(hid_t loc_id, const char *old_name, const char *new_name H5_DLL herr_t H5Arename_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); #endif + hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); /*--------------------------------------------------------------------------*/ /** * \ingroup ASYNC @@ -949,10 +939,9 @@ H5_DLL herr_t H5Arename_async( H5_DLL herr_t H5Arename_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id, hid_t es_id); -#endif /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -990,9 +979,8 @@ H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); H5_DLL herr_t H5Awrite_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); #endif + hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); /*-------------------------------------------------------------------------*/ /** * \ingroup H5A diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index c26f5708b83..c96a9e270b9 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -323,10 +323,9 @@ H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t spa H5_DLL hid_t H5Dcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t es_id); -#endif /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -404,9 +403,8 @@ H5_DLL hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id); H5_DLL hid_t H5Dopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); /** * -------------------------------------------------------------------------- *\ingroup H5D @@ -441,9 +439,8 @@ H5_DLL hid_t H5Dget_space(hid_t dset_id); H5_DLL hid_t H5Dget_space_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t dset_id, hid_t es_id); #endif + hid_t dset_id, hid_t es_id); /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -913,17 +910,19 @@ H5_DLL herr_t H5Dread_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], H5_DLL herr_t H5Dread_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf /*out*/, hid_t es_id); -#endif /** * -------------------------------------------------------------------------- * \ingroup ASYNC * \async_variant_of{H5Dread_multi} */ -H5_DLL herr_t H5Dread_multi_async(const char *app_file, const char *app_func, unsigned app_line, size_t count, - hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], +H5_DLL herr_t H5Dread_multi_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#endif + size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); /** @@ -1097,16 +1096,18 @@ H5_DLL herr_t H5Dwrite_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], H5_DLL herr_t H5Dwrite_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, hid_t es_id); -#endif /** * -------------------------------------------------------------------------- * \ingroup ASYNC * \async_variant_of{H5Dwrite_multi} */ -H5_DLL herr_t H5Dwrite_multi_async(const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dwrite_multi_async( +#ifndef H5_DOXYGEN + const char *app_file, const char *app_func, unsigned app_line, +#endif size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], hid_t dxpl_id, const void *buf[], hid_t es_id); @@ -1397,9 +1398,8 @@ H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]); H5_DLL herr_t H5Dset_extent_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t dset_id, const hsize_t size[], hid_t es_id); #endif + hid_t dset_id, const hsize_t size[], hid_t es_id); /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -1579,9 +1579,8 @@ H5_DLL herr_t H5Dclose(hid_t dset_id); H5_DLL herr_t H5Dclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t dset_id, hid_t es_id); #endif + hid_t dset_id, hid_t es_id); /// \cond DEV /* Internal API routines */ H5_DLL herr_t H5Ddebug(hid_t dset_id); @@ -1594,24 +1593,28 @@ H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type); /* (Must be defined _after_ the function prototype) */ /* (And must only defined when included in application code, not the library) */ #ifndef H5D_MODULE -#define H5Dcreate_async(...) H5Dcreate_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dcreate_async(...) H5Dcreate_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dwrite_multi_async(...) H5Dwrite_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dread_multi_async(...) H5Dread_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) /* Define "wrapper" versions of function calls, to allow compile-time values to * be passed in by language wrapper or library layer on top of HDF5. */ -#define H5Dcreate_async_wrap H5_NO_EXPAND(H5Dcreate_async) -#define H5Dopen_async_wrap H5_NO_EXPAND(H5Dopen_async) -#define H5Dget_space_async_wrap H5_NO_EXPAND(H5Dget_space_async) -#define H5Dread_async_wrap H5_NO_EXPAND(H5Dread_async) -#define H5Dwrite_async_wrap H5_NO_EXPAND(H5Dwrite_async) -#define H5Dset_extent_async_wrap H5_NO_EXPAND(H5Dset_extent_async) -#define H5Dclose_async_wrap H5_NO_EXPAND(H5Dclose_async) +#define H5Dcreate_async_wrap H5_NO_EXPAND(H5Dcreate_async) +#define H5Dopen_async_wrap H5_NO_EXPAND(H5Dopen_async) +#define H5Dget_space_async_wrap H5_NO_EXPAND(H5Dget_space_async) +#define H5Dread_async_wrap H5_NO_EXPAND(H5Dread_async) +#define H5Dwrite_async_wrap H5_NO_EXPAND(H5Dwrite_async) +#define H5Dset_extent_async_wrap H5_NO_EXPAND(H5Dset_extent_async) +#define H5Dclose_async_wrap H5_NO_EXPAND(H5Dclose_async) +#define H5Dwrite_multi_async_wrap H5_NO_EXPAND(H5Dwrite_multi_async_wrap) +#define H5Dread_multi_async_wrap H5_NO_EXPAND(5Dread_multi_async_wrap) #endif /* H5D_MODULE */ /// \endcond diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index e842ca2649b..df1db438be3 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -360,9 +360,8 @@ H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_ H5_DLL hid_t H5Fcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); #endif + const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); /** * \ingroup H5F * @@ -464,9 +463,8 @@ H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id); H5_DLL hid_t H5Fopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); #endif + const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); /** * \ingroup H5F * @@ -501,9 +499,8 @@ H5_DLL hid_t H5Freopen(hid_t file_id); H5_DLL hid_t H5Freopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t file_id, hid_t es_id); #endif + hid_t file_id, hid_t es_id); /** * \ingroup H5F * @@ -545,9 +542,8 @@ H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); H5_DLL herr_t H5Fflush_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t object_id, H5F_scope_t scope, hid_t es_id); #endif + hid_t object_id, H5F_scope_t scope, hid_t es_id); /** * \ingroup H5F * @@ -600,9 +596,8 @@ H5_DLL herr_t H5Fclose(hid_t file_id); H5_DLL herr_t H5Fclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t file_id, hid_t es_id); #endif + hid_t file_id, hid_t es_id); /** * \ingroup H5F * diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 1c994622e6e..a74ec5e1499 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -133,9 +133,8 @@ H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcp H5_DLL hid_t H5Gcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5G @@ -220,12 +219,11 @@ H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id); * \ingroup ASYNC * \async_variant_of{H5Gopen} */ -H5_DLL hid_t H5Gopen( +H5_DLL hid_t H5Gopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5G @@ -282,12 +280,11 @@ H5_DLL herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo); * \ingroup ASYNC * \async_variant_of{H5Gget_info} */ -H5_DLL herr_t H5Gget_info( +H5_DLL herr_t H5Gget_info_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); #endif + hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5G @@ -327,12 +324,11 @@ H5_DLL herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *gi * \ingroup ASYNC * \async_variant_of{H5Gget_info_by_name} */ -H5_DLL herr_t H5Gget_info_by_name( +H5_DLL herr_t H5Gget_info_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5G @@ -386,13 +382,12 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_ * \ingroup ASYNC * \async_variant_of{H5Gget_info_by_idx} */ -H5_DLL herr_t H5Gget_info_by_idx( +H5_DLL herr_t H5Gget_info_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); -#endif /** *------------------------------------------------------------------------- * \ingroup H5G @@ -477,12 +472,11 @@ H5_DLL herr_t H5Gclose(hid_t group_id); * \ingroup ASYNC * \async_variant_of{H5Gclose} */ -H5_DLL herr_t H5Gclose( +H5_DLL herr_t H5Gclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t group_id, hid_t es_id); #endif + hid_t group_id, hid_t es_id); /// \cond DEV /* API Wrappers for async routines */ /* (Must be defined _after_ the function prototype) */ diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 400c9c2fda5..74fe548502b 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -297,10 +297,9 @@ H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, H5_DLL herr_t H5Lcreate_hard_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); -#endif /** * \ingroup H5L * @@ -373,10 +372,9 @@ H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const c H5_DLL herr_t H5Lcreate_soft_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); -#endif /** * \ingroup H5L * @@ -422,9 +420,8 @@ H5_DLL herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id); H5_DLL herr_t H5Ldelete_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); /** * \ingroup H5L * @@ -461,10 +458,9 @@ H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t H5_DLL herr_t H5Ldelete_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); -#endif /** * \ingroup H5L * @@ -671,9 +667,8 @@ H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id); H5_DLL herr_t H5Lexists_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); /** * \ingroup H5L * @@ -926,10 +921,9 @@ H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t ord H5_DLL herr_t H5Literate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, void *op_data, hid_t es_id); -#endif /** * \ingroup TRAV * diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 55cab3cfbef..199a8979a38 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -229,10 +229,9 @@ H5_DLL hid_t H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t H5_DLL hid_t H5Mcreate_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id, hid_t es_id); -#endif /** * \ingroup H5M * @@ -272,9 +271,8 @@ H5_DLL hid_t H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id); H5_DLL hid_t H5Mopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); /** * \ingroup H5M * @@ -301,9 +299,8 @@ H5_DLL herr_t H5Mclose(hid_t map_id); H5_DLL herr_t H5Mclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t map_id, hid_t es_id); #endif + hid_t map_id, hid_t es_id); /** * \ingroup H5M * @@ -426,10 +423,9 @@ H5_DLL herr_t H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t H5_DLL herr_t H5Mput_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id, hid_t es_id); -#endif /** * \ingroup H5M * @@ -470,10 +466,9 @@ H5_DLL herr_t H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t H5_DLL herr_t H5Mget_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, hid_t es_id); -#endif /** * \ingroup H5M * diff --git a/src/H5Opublic.h b/src/H5Opublic.h index 7bdf9215e9c..294ef5686f5 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -277,9 +277,8 @@ H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id); H5_DLL hid_t H5Oopen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5O @@ -364,10 +363,9 @@ H5_DLL hid_t H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx H5_DLL hid_t H5Oopen_by_idx_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); -#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -549,9 +547,8 @@ H5_DLL herr_t H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t * H5_DLL herr_t H5Oget_info_by_name_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, hid_t es_id); /** *------------------------------------------------------------------------- @@ -939,10 +936,9 @@ H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, H5_DLL herr_t H5Ocopy_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else +#endif hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t es_id); -#endif /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1350,9 +1346,8 @@ H5_DLL herr_t H5Oclose(hid_t object_id); H5_DLL herr_t H5Oclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t object_id, hid_t es_id); #endif + hid_t object_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1393,9 +1388,8 @@ H5_DLL herr_t H5Oflush(hid_t obj_id); H5_DLL herr_t H5Oflush_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t obj_id, hid_t es_id); #endif + hid_t obj_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1429,9 +1423,8 @@ H5_DLL herr_t H5Orefresh(hid_t oid); H5_DLL herr_t H5Orefresh_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t oid, hid_t es_id); #endif + hid_t oid, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5O diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index f43b1038130..a0493aa66a3 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -351,9 +351,8 @@ H5_DLL hid_t H5Ropen_object(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); H5_DLL hid_t H5Ropen_object_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #endif + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); /** * -------------------------------------------------------------------------- * \ingroup H5R @@ -395,9 +394,8 @@ H5_DLL hid_t H5Ropen_region(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); H5_DLL hid_t H5Ropen_region_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #endif + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); /** * -------------------------------------------------------------------------- * \ingroup H5R @@ -436,9 +434,8 @@ H5_DLL hid_t H5Ropen_attr(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id); H5_DLL hid_t H5Ropen_attr_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); #endif + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); /* Get type */ /** diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index 7a0dcb83420..bca7143be55 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -1098,9 +1098,8 @@ H5_DLL herr_t H5Tclose(hid_t type_id); H5_DLL herr_t H5Tclose_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, -#else - unsigned app_line, hid_t type_id, hid_t es_id); #endif + unsigned app_line, hid_t type_id, hid_t es_id); /** * \ingroup H5T * @@ -1192,9 +1191,8 @@ H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lc H5_DLL herr_t H5Tcommit_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); /** * -------------------------------------------------------------------------- * \ingroup H5T @@ -1228,9 +1226,8 @@ H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id); H5_DLL hid_t H5Topen_async( #ifndef H5_DOXYGEN const char *app_file, const char *app_func, unsigned app_line, -#else - hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); #endif + hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); /** * \ingroup H5T * From fd322191fff4b040310c89074676d93def234b18 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Fri, 21 Oct 2022 12:19:52 -0500 Subject: [PATCH 05/11] format fixes --- src/H5Apublic.h | 24 ++++++++++++------------ src/H5Dpublic.h | 26 +++++++++++++------------- src/H5Fpublic.h | 10 +++++----- src/H5Gpublic.h | 12 ++++++------ src/H5Lpublic.h | 12 ++++++------ src/H5Mpublic.h | 10 +++++----- src/H5Opublic.h | 14 +++++++------- src/H5Rpublic.h | 6 +++--- src/H5Tpublic.h | 6 +++--- 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/H5Apublic.h b/src/H5Apublic.h index ee5f5716c10..52985439e11 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -96,7 +96,7 @@ H5_DLL herr_t H5Aclose(hid_t attr_id); */ H5_DLL herr_t H5Aclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t attr_id, hid_t es_id); /* --------------------------------------------------------------------------*/ @@ -147,7 +147,7 @@ H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_ */ H5_DLL hid_t H5Acreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t es_id); @@ -198,7 +198,7 @@ H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *a */ H5_DLL hid_t H5Acreate_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, hid_t es_id); @@ -320,7 +320,7 @@ H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name); */ H5_DLL herr_t H5Aexists_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); /*-------------------------------------------------------------------------*/ @@ -361,7 +361,7 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char * */ H5_DLL herr_t H5Aexists_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t *exists, hid_t lapl_id, hid_t es_id); /*-------------------------------------------------------------------------*/ @@ -750,7 +750,7 @@ H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id); */ H5_DLL hid_t H5Aopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); /*--------------------------------------------------------------------------*/ @@ -803,7 +803,7 @@ H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_t */ H5_DLL hid_t H5Aopen_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id, hid_t es_id); @@ -855,7 +855,7 @@ H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *att */ H5_DLL hid_t H5Aopen_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); /*-------------------------------------------------------------------------- */ @@ -896,7 +896,7 @@ H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf); */ H5_DLL herr_t H5Aread_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); /*-------------------------------------------------------------------------*/ @@ -928,7 +928,7 @@ H5_DLL herr_t H5Arename(hid_t loc_id, const char *old_name, const char *new_name */ H5_DLL herr_t H5Arename_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); /*--------------------------------------------------------------------------*/ @@ -938,7 +938,7 @@ H5_DLL herr_t H5Arename_async( */ H5_DLL herr_t H5Arename_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id, hid_t es_id); @@ -978,7 +978,7 @@ H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); */ H5_DLL herr_t H5Awrite_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); /*-------------------------------------------------------------------------*/ diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index c96a9e270b9..c2fcd8f2635 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -322,7 +322,7 @@ H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t spa */ H5_DLL hid_t H5Dcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t es_id); @@ -402,7 +402,7 @@ H5_DLL hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id); */ H5_DLL hid_t H5Dopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); /** @@ -438,7 +438,7 @@ H5_DLL hid_t H5Dget_space(hid_t dset_id); */ H5_DLL hid_t H5Dget_space_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t dset_id, hid_t es_id); /** @@ -909,7 +909,7 @@ H5_DLL herr_t H5Dread_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], */ H5_DLL herr_t H5Dread_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf /*out*/, hid_t es_id); @@ -920,10 +920,10 @@ H5_DLL herr_t H5Dread_async( */ H5_DLL herr_t H5Dread_multi_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif - size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], - hid_t file_space_id[], hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); + size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], + hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); /** * -------------------------------------------------------------------------- @@ -1095,7 +1095,7 @@ H5_DLL herr_t H5Dwrite_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], */ H5_DLL herr_t H5Dwrite_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, hid_t es_id); @@ -1106,10 +1106,10 @@ H5_DLL herr_t H5Dwrite_async( */ H5_DLL herr_t H5Dwrite_multi_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif - size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], - hid_t file_space_id[], hid_t dxpl_id, const void *buf[], hid_t es_id); + size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], + hid_t dxpl_id, const void *buf[], hid_t es_id); /** * -------------------------------------------------------------------------- @@ -1397,7 +1397,7 @@ H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]); */ H5_DLL herr_t H5Dset_extent_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t dset_id, const hsize_t size[], hid_t es_id); /** @@ -1578,7 +1578,7 @@ H5_DLL herr_t H5Dclose(hid_t dset_id); */ H5_DLL herr_t H5Dclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t dset_id, hid_t es_id); /// \cond DEV diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index df1db438be3..38161d36df1 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -359,7 +359,7 @@ H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_ */ H5_DLL hid_t H5Fcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); /** @@ -462,7 +462,7 @@ H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id); */ H5_DLL hid_t H5Fopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); /** @@ -498,7 +498,7 @@ H5_DLL hid_t H5Freopen(hid_t file_id); */ H5_DLL hid_t H5Freopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t file_id, hid_t es_id); /** @@ -541,7 +541,7 @@ H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); */ H5_DLL herr_t H5Fflush_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t object_id, H5F_scope_t scope, hid_t es_id); /** @@ -595,7 +595,7 @@ H5_DLL herr_t H5Fclose(hid_t file_id); */ H5_DLL herr_t H5Fclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t file_id, hid_t es_id); /** diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index a74ec5e1499..ffb43c655f6 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -132,7 +132,7 @@ H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcp */ H5_DLL hid_t H5Gcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); /** @@ -221,7 +221,7 @@ H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id); */ H5_DLL hid_t H5Gopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); /** @@ -282,7 +282,7 @@ H5_DLL herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo); */ H5_DLL herr_t H5Gget_info_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); /** @@ -326,7 +326,7 @@ H5_DLL herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *gi */ H5_DLL herr_t H5Gget_info_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); /** @@ -384,7 +384,7 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_ */ H5_DLL herr_t H5Gget_info_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); @@ -474,7 +474,7 @@ H5_DLL herr_t H5Gclose(hid_t group_id); */ H5_DLL herr_t H5Gclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t group_id, hid_t es_id); /// \cond DEV diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 74fe548502b..42c7b1a59bd 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -296,7 +296,7 @@ H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, */ H5_DLL herr_t H5Lcreate_hard_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); @@ -371,7 +371,7 @@ H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const c */ H5_DLL herr_t H5Lcreate_soft_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); @@ -419,7 +419,7 @@ H5_DLL herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id); */ H5_DLL herr_t H5Ldelete_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); /** @@ -457,7 +457,7 @@ H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t */ H5_DLL herr_t H5Ldelete_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); @@ -666,7 +666,7 @@ H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id); */ H5_DLL herr_t H5Lexists_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); /** @@ -920,7 +920,7 @@ H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t ord */ H5_DLL herr_t H5Literate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, void *op_data, hid_t es_id); diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 199a8979a38..e507f7edc2b 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -228,7 +228,7 @@ H5_DLL hid_t H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t */ H5_DLL hid_t H5Mcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id, hid_t es_id); @@ -270,7 +270,7 @@ H5_DLL hid_t H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id); */ H5_DLL hid_t H5Mopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); /** @@ -298,7 +298,7 @@ H5_DLL herr_t H5Mclose(hid_t map_id); */ H5_DLL herr_t H5Mclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t map_id, hid_t es_id); /** @@ -422,7 +422,7 @@ H5_DLL herr_t H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t */ H5_DLL herr_t H5Mput_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id, hid_t es_id); @@ -465,7 +465,7 @@ H5_DLL herr_t H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t */ H5_DLL herr_t H5Mget_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, hid_t es_id); diff --git a/src/H5Opublic.h b/src/H5Opublic.h index 294ef5686f5..bfe979cfd50 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -276,7 +276,7 @@ H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id); */ H5_DLL hid_t H5Oopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); /** @@ -362,7 +362,7 @@ H5_DLL hid_t H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx */ H5_DLL hid_t H5Oopen_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); @@ -546,7 +546,7 @@ H5_DLL herr_t H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t * */ H5_DLL herr_t H5Oget_info_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, hid_t es_id); @@ -935,7 +935,7 @@ H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, */ H5_DLL herr_t H5Ocopy_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t es_id); @@ -1345,7 +1345,7 @@ H5_DLL herr_t H5Oclose(hid_t object_id); */ H5_DLL herr_t H5Oclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t object_id, hid_t es_id); /** @@ -1387,7 +1387,7 @@ H5_DLL herr_t H5Oflush(hid_t obj_id); */ H5_DLL herr_t H5Oflush_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t obj_id, hid_t es_id); /** @@ -1422,7 +1422,7 @@ H5_DLL herr_t H5Orefresh(hid_t oid); */ H5_DLL herr_t H5Orefresh_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t oid, hid_t es_id); /** diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index a0493aa66a3..8526db58d23 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -350,7 +350,7 @@ H5_DLL hid_t H5Ropen_object(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); */ H5_DLL hid_t H5Ropen_object_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); /** @@ -393,7 +393,7 @@ H5_DLL hid_t H5Ropen_region(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); */ H5_DLL hid_t H5Ropen_region_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); /** @@ -433,7 +433,7 @@ H5_DLL hid_t H5Ropen_attr(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id); */ H5_DLL hid_t H5Ropen_attr_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); /* Get type */ diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index bca7143be55..eecceb5728b 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -1097,7 +1097,7 @@ H5_DLL herr_t H5Tclose(hid_t type_id); */ H5_DLL herr_t H5Tclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, + const char *app_file, const char *app_func, #endif unsigned app_line, hid_t type_id, hid_t es_id); /** @@ -1190,7 +1190,7 @@ H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lc */ H5_DLL herr_t H5Tcommit_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); /** @@ -1225,7 +1225,7 @@ H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id); */ H5_DLL hid_t H5Topen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, + const char *app_file, const char *app_func, unsigned app_line, #endif hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); /** From 1c06726b9d41c038f577c8ad40bd0249c58c262a Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 21 Oct 2022 12:35:59 -0500 Subject: [PATCH 06/11] Use H5_DOXYGEN instead of H5_DOXYGEN_FORTRAN --- configure.ac | 2 +- doxygen/CMakeLists.txt | 2 +- fortran/src/H5Aff.F90 | 4 +-- fortran/src/H5Dff.F90 | 6 ++--- fortran/src/H5Fff.F90 | 2 +- fortran/src/H5Pff.F90 | 6 ++--- fortran/src/H5Rff.F90 | 18 ++++++------- fortran/src/H5Tff.F90 | 10 +++---- fortran/src/H5f90global.F90 | 2 +- hl/fortran/src/H5LTff.F90 | 26 +++++++++--------- hl/fortran/src/H5TBff.F90 | 54 ++++++++++++++++++------------------- 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/configure.ac b/configure.ac index 97af016ea95..b045af42c53 100644 --- a/configure.ac +++ b/configure.ac @@ -1260,7 +1260,7 @@ if test "X$HDF5_DOXYGEN" = "Xyes"; then DOXYGEN_SEARCHENGINE_URL= DOXYGEN_STRIP_FROM_PATH='$(SRCDIR)' DOXYGEN_STRIP_FROM_INC_PATH='$(SRCDIR)' - DOXYGEN_PREDEFINED='H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_DOXYGEN_FORTRAN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD' + DOXYGEN_PREDEFINED='H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD' DX_INIT_DOXYGEN([HDF5], [./doxygen/Doxyfile], [hdf5lib_docs]) fi diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt index 7589ff4ca37..2853997459f 100644 --- a/doxygen/CMakeLists.txt +++ b/doxygen/CMakeLists.txt @@ -29,7 +29,7 @@ if (DOXYGEN_FOUND) set (DOXYGEN_SEARCHENGINE_URL) set (DOXYGEN_STRIP_FROM_PATH ${HDF5_SOURCE_DIR}) set (DOXYGEN_STRIP_FROM_INC_PATH ${HDF5_SOURCE_DIR}) - set (DOXYGEN_PREDEFINED "H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_DOXYGEN_FORTRAN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD") + set (DOXYGEN_PREDEFINED "H5_HAVE_DIRECT H5_HAVE_LIBHDFS H5_HAVE_MAP_API H5_HAVE_PARALLEL H5_HAVE_ROS3_VFD H5_DOXYGEN H5_HAVE_SUBFILING_VFD H5_HAVE_IOC_VFD") # This configure and individual custom targets work together # Replace variables inside @@ with the current values diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90 index 0009c31ac09..313aebf4393 100644 --- a/fortran/src/H5Aff.F90 +++ b/fortran/src/H5Aff.F90 @@ -78,7 +78,7 @@ MODULE H5A PRIVATE h5awrite_char_scalar, h5awrite_ptr PRIVATE h5aread_char_scalar, h5aread_ptr -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5awrite_f MODULE PROCEDURE h5awrite_char_scalar ! This is the preferred way to call h5awrite @@ -1332,7 +1332,7 @@ END FUNCTION H5Arename_c END SUBROUTINE H5Arename_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90 index 1e883990134..6e5b03da842 100644 --- a/fortran/src/H5Dff.F90 +++ b/fortran/src/H5Dff.F90 @@ -103,7 +103,7 @@ MODULE H5D MODULE PROCEDURE h5dset_extent_f END INTERFACE -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5dwrite_f MODULE PROCEDURE h5dwrite_reference_obj @@ -584,7 +584,7 @@ END FUNCTION h5dcreate_anon_c END SUBROUTINE h5dcreate_anon_f -#if H5_DOXYGEN_FORTRAN +#if H5_DOXYGEN !> !! \ingroup FH5D !! @@ -1094,7 +1094,7 @@ END FUNCTION h5dvlen_reclaim_c END SUBROUTINE H5Dvlen_reclaim_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5D !! diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90 index 5d8d687d7d3..77c7b8e2132 100644 --- a/fortran/src/H5Fff.F90 +++ b/fortran/src/H5Fff.F90 @@ -44,7 +44,7 @@ MODULE H5F ! Number of objects opened in H5open_f INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE INTEGER(C_INT) FUNCTION h5fis_accessible(name, & access_prp_default) BIND(C,NAME='H5Fis_accessible') diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90 index 742cef55a3f..0e1b0e77a8a 100644 --- a/fortran/src/H5Pff.F90 +++ b/fortran/src/H5Pff.F90 @@ -52,7 +52,7 @@ MODULE H5P PRIVATE h5pregister_integer, h5pregister_ptr PRIVATE h5pinsert_integer, h5pinsert_char, h5pinsert_ptr -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5pset_fapl_multi_f MODULE PROCEDURE h5pset_fapl_multi_l @@ -2662,7 +2662,7 @@ END FUNCTION h5pset_family_offset_c END SUBROUTINE h5pset_family_offset_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5P @@ -4177,7 +4177,7 @@ END FUNCTION h5pget_chunk_cache_c END SUBROUTINE h5pget_chunk_cache_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5P !! diff --git a/fortran/src/H5Rff.F90 b/fortran/src/H5Rff.F90 index 82b91ddd9bd..3942a87548f 100644 --- a/fortran/src/H5Rff.F90 +++ b/fortran/src/H5Rff.F90 @@ -79,7 +79,7 @@ MODULE H5R MODULE PROCEDURE h5rget_object_type_obj_f END INTERFACE -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5rget_region_f MODULE PROCEDURE h5rget_region_ptr_f ! F2003 @@ -178,7 +178,7 @@ END FUNCTION h5rget_region_ptr_c !! \li H5G_TYPE_F !! \param hdferr \fortran_error !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN SUBROUTINE h5rget_object_type_f(& #else SUBROUTINE h5rget_object_type_obj_f(& @@ -204,7 +204,7 @@ END FUNCTION h5rget_object_type_obj_c ref_f = ref%ref hdferr = h5rget_object_type_obj_c(dset_id, ref_f, obj_type ) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5rget_object_type_f #else END SUBROUTINE h5rget_object_type_obj_f @@ -260,7 +260,7 @@ END SUBROUTINE h5rget_region_region_f !! !! See C API: @ref H5Rget_region() !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN SUBROUTINE h5rget_region_f(& #else SUBROUTINE h5rget_region_ptr_f(& @@ -274,7 +274,7 @@ SUBROUTINE h5rget_region_ptr_f(& hdferr = h5rget_region_ptr_c(dset_id, ref, space_id) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5rget_region_f #else END SUBROUTINE h5rget_region_ptr_f @@ -373,7 +373,7 @@ END SUBROUTINE h5rcreate_region_f !! \param hdferr \fortran_error !! \param space_id Dataspace identifier that describes selected region. !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !! See C API: @ref H5Rcreate_object() !! SUBROUTINE h5rcreate_f(& @@ -397,7 +397,7 @@ SUBROUTINE h5rcreate_ptr_f(& IF(PRESENT(space_id)) space_id_c = space_id hdferr = h5rcreate_ptr_c(ref, loc_id, name, namelen, ref_type, space_id_c) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5rcreate_f #else END SUBROUTINE h5rcreate_ptr_f @@ -566,7 +566,7 @@ END SUBROUTINE h5rget_name_region_f !!\param size The size of the name buffer, returning 0 (zero) if no name is associated with the identifier. !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !! See C API: @ref H5Rget_name() !! SUBROUTINE h5rget_name_f(& @@ -591,7 +591,7 @@ SUBROUTINE h5rget_name_ptr_f(& IF(PRESENT(size)) size = size_default -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5rget_name_f #else END SUBROUTINE h5rget_name_ptr_f diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90 index 60630b73f2b..35708ebb5f7 100644 --- a/fortran/src/H5Tff.F90 +++ b/fortran/src/H5Tff.F90 @@ -51,7 +51,7 @@ MODULE H5T TYPE(C_PTR) :: p !< Pointer to VL data END TYPE hvl_t -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5tenum_insert_f MODULE PROCEDURE h5tenum_insert_f03 @@ -2088,7 +2088,7 @@ END SUBROUTINE h5tconvert_f !! \param value Pointer to the value of the new member. !! \param hdferr \fortran_error !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !! See C API: @ref H5Tenum_insert() !! SUBROUTINE h5tenum_insert_f(& @@ -2118,7 +2118,7 @@ END FUNCTION h5tenum_insert_ptr_c namelen = LEN(name) hdferr = h5tenum_insert_ptr_c(type_id, name, namelen, value) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tenum_insert_f #else END SUBROUTINE h5tenum_insert_f03 @@ -2136,7 +2136,7 @@ END SUBROUTINE h5tenum_insert_f03 !! \param value Value of the new member. !! \param hdferr \fortran_error !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !! See C API: @ref H5Tenum_insert() !! SUBROUTINE h5tenum_insert_f(type_id, name, value, hdferr) @@ -2163,7 +2163,7 @@ END FUNCTION h5tenum_insert_c namelen = LEN(name) hdferr = h5tenum_insert_c(type_id, name, namelen, value) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tenum_insert_f #else END SUBROUTINE h5tenum_insert_f90 diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 index 6ad3366a402..96066e9bcc9 100644 --- a/fortran/src/H5f90global.F90 +++ b/fortran/src/H5f90global.F90 @@ -172,7 +172,7 @@ MODULE H5GLOBAL INTEGER(HID_T) :: H5T_FORTRAN_S1 !< H5T_FORTRAN_S1 INTEGER(HID_T) :: H5T_C_S1 !< H5T_C_S1 -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTEGER, PARAMETER :: NUM_NATIVE_INTEGER_KIND = 5 ! INTEGER*1, INTEGER*2, INTEGER*4, INTEGER*8, INTEGER*16 INTEGER(HID_T), DIMENSION(1:NUM_NATIVE_INTEGER_KIND) :: H5T_NATIVE_INTEGER_KIND diff --git a/hl/fortran/src/H5LTff.F90 b/hl/fortran/src/H5LTff.F90 index f5fa703d65e..f1c182f3911 100644 --- a/hl/fortran/src/H5LTff.F90 +++ b/hl/fortran/src/H5LTff.F90 @@ -35,7 +35,7 @@ #include -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE H5LT #else MODULE H5LT_CONST @@ -45,7 +45,7 @@ MODULE H5LT_CONST USE h5fortran_types USE hdf5 -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5ltmake_dataset_f MODULE PROCEDURE h5ltmake_dataset_f_ptr @@ -130,7 +130,7 @@ END FUNCTION h5ltget_attribute_c ! Make/Read dataset functions !------------------------------------------------------------------------- -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5LT !! @@ -173,13 +173,13 @@ SUBROUTINE h5ltmake_dataset_f_ptr( & namelen = LEN(dset_name) errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5ltmake_dataset_f #else END SUBROUTINE h5ltmake_dataset_f_ptr #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5LT !! @@ -215,7 +215,7 @@ SUBROUTINE h5ltmake_dataset_f_int1(& INTEGER, INTENT(in) :: rank INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims INTEGER(hid_t), INTENT(in) :: type_id -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN TYPE(TYPE), INTENT(in), DIMENSION(*,*,...) :: buf #else INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf @@ -227,7 +227,7 @@ SUBROUTINE h5ltmake_dataset_f_int1(& f_ptr = C_LOC(buf(1)) namelen = LEN(dset_name) errcode = h5ltmake_dataset_c(loc_id,namelen,dset_name,rank,dims,type_id,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5ltmake_dataset_f #else END SUBROUTINE h5ltmake_dataset_f_int1 @@ -375,7 +375,7 @@ SUBROUTINE h5ltmake_dataset_f_int7(loc_id, dset_name, rank, dims, & END SUBROUTINE h5ltmake_dataset_f_int7 #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5LT !! @@ -411,13 +411,13 @@ SUBROUTINE h5ltread_dataset_f_ptr(& namelen = LEN(dset_name) errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id, buf) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5ltread_dataset_f #else END SUBROUTINE h5ltread_dataset_f_ptr #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5LT !! @@ -450,7 +450,7 @@ SUBROUTINE h5ltread_dataset_f_int1(& CHARACTER(LEN=*), INTENT(in) :: dset_name INTEGER(hid_t), INTENT(in) :: type_id INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN TYPE(TYPE), INTENT(inout), DIMENSION(*,*,...) :: buf #else INTEGER, INTENT(inout), DIMENSION(*), TARGET :: buf @@ -464,7 +464,7 @@ SUBROUTINE h5ltread_dataset_f_int1(& namelen = LEN(dset_name) errcode = h5ltread_dataset_c(loc_id,namelen,dset_name,type_id,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5ltread_dataset_f #else END SUBROUTINE h5ltread_dataset_f_int1 @@ -1845,7 +1845,7 @@ END FUNCTION h5ltpath_valid_c END SUBROUTINE h5ltpath_valid_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END MODULE H5LT #else END MODULE H5LT_CONST diff --git a/hl/fortran/src/H5TBff.F90 b/hl/fortran/src/H5TBff.F90 index 4798f2e57c1..adf42d6a263 100644 --- a/hl/fortran/src/H5TBff.F90 +++ b/hl/fortran/src/H5TBff.F90 @@ -33,7 +33,7 @@ ! This is needed for Windows based operating systems. ! #include "H5config_f.inc" -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE H5TB #else MODULE H5TB_CONST @@ -44,7 +44,7 @@ MODULE H5TB_CONST USE hdf5 INTERFACE h5tbwrite_field_name_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE PROCEDURE h5tbwrite_field_name_f #else MODULE PROCEDURE h5tbwrite_field_name_f_int @@ -53,7 +53,7 @@ MODULE H5TB_CONST END INTERFACE INTERFACE h5tbread_field_name_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE PROCEDURE h5tbread_field_name_f #else MODULE PROCEDURE h5tbread_field_name_f_int @@ -62,7 +62,7 @@ MODULE H5TB_CONST END INTERFACE INTERFACE h5tbwrite_field_index_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE PROCEDURE h5tbwrite_field_index_f #else MODULE PROCEDURE h5tbwrite_field_index_f_int @@ -71,7 +71,7 @@ MODULE H5TB_CONST END INTERFACE INTERFACE h5tbread_field_index_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE PROCEDURE h5tbread_field_index_f #else MODULE PROCEDURE h5tbread_field_index_f_int @@ -80,7 +80,7 @@ MODULE H5TB_CONST END INTERFACE INTERFACE h5tbinsert_field_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN MODULE PROCEDURE h5tbinsert_field_f #else MODULE PROCEDURE h5tbinsert_field_f_int @@ -89,7 +89,7 @@ MODULE H5TB_CONST END INTERFACE -#ifndef H5_DOXYGEN_FORTRAN +#ifndef H5_DOXYGEN INTERFACE h5tbmake_table_f MODULE PROCEDURE h5tbmake_table_f90 @@ -218,7 +218,7 @@ END FUNCTION h5tbinsert_field_c !! !! See C API: @ref H5TBmake_table() !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN SUBROUTINE h5tbmake_table_f(& #else SUBROUTINE h5tbmake_table_f90(& @@ -307,7 +307,7 @@ END FUNCTION h5tbmake_table_c type_size, field_offset, field_types, chunk_size, compress, char_len_field_names, & max_char_size_field_names, field_names) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbmake_table_f #else END SUBROUTINE h5tbmake_table_f90 @@ -337,7 +337,7 @@ END SUBROUTINE h5tbmake_table_f90 !! !! See C API: @ref H5TBmake_table() !! -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN SUBROUTINE h5tbmake_table_f(& #else SUBROUTINE h5tbmake_table_ptr_f(& @@ -435,7 +435,7 @@ END FUNCTION h5tbmake_table_ptr_c type_size, field_offset, field_types, chunk_size, fill_data, compress, char_len_field_names, & max_char_size_field_names, field_names, data) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbmake_table_f #else END SUBROUTINE h5tbmake_table_ptr_f @@ -510,7 +510,7 @@ END FUNCTION h5tbread_table_c END SUBROUTINE h5tbread_table_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5TB !! @@ -547,7 +547,7 @@ SUBROUTINE h5tbwrite_field_name_f_int(& INTEGER(hsize_t), INTENT(in) :: start INTEGER(hsize_t), INTENT(in) :: nrecords INTEGER(size_t), INTENT(in) :: type_size -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN TYPE(TYPE), INTENT(in), DIMENSION(*) :: buf #else INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf @@ -563,7 +563,7 @@ SUBROUTINE h5tbwrite_field_name_f_int(& errcode = h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbwrite_field_name_f #else END SUBROUTINE h5tbwrite_field_name_f_int @@ -602,7 +602,7 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,& END SUBROUTINE h5tbwrite_field_name_f_string #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5TB !! @@ -640,7 +640,7 @@ SUBROUTINE h5tbread_field_name_f_int(& INTEGER(hsize_t), INTENT(in) :: start INTEGER(hsize_t), INTENT(in) :: nrecords INTEGER(size_t), INTENT(in) :: type_size -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN TYPE(TYPE), INTENT(INOUT), DIMENSION(*):: buf #else INTEGER, INTENT(INOUT), DIMENSION(*), TARGET :: buf @@ -658,7 +658,7 @@ SUBROUTINE h5tbread_field_name_f_int(& errcode = h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbread_field_name_f #else END SUBROUTINE h5tbread_field_name_f_int @@ -696,7 +696,7 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,& END SUBROUTINE h5tbread_field_name_f_string #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5TB !! @@ -733,7 +733,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(& INTEGER(hsize_t), INTENT(in) :: start INTEGER(hsize_t), INTENT(in) :: nrecords INTEGER(size_t), INTENT(in) :: type_size -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN INTEGER, INTENT(in), DIMENSION(*) :: buf #else INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf @@ -749,7 +749,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(& errcode = h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbwrite_field_index_f #else END SUBROUTINE h5tbwrite_field_index_f_int @@ -784,7 +784,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,& END SUBROUTINE h5tbwrite_field_index_f_string #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5TB !! @@ -821,7 +821,7 @@ SUBROUTINE h5tbread_field_index_f_int(& INTEGER(hsize_t), INTENT(in) :: start INTEGER(hsize_t), INTENT(in) :: nrecords INTEGER(size_t), INTENT(in) :: type_size -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN TYPE(TYPE), INTENT(INOUT), DIMENSION(*) :: buf #else INTEGER, INTENT(INOUT), DIMENSION(*), TARGET :: buf @@ -835,7 +835,7 @@ SUBROUTINE h5tbread_field_index_f_int(& errcode = h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbread_field_index_f #else END SUBROUTINE h5tbread_field_index_f_int @@ -870,7 +870,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,& END SUBROUTINE h5tbread_field_index_f_string #endif -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN !> !! \ingroup FH5TB !! @@ -903,7 +903,7 @@ SUBROUTINE h5tbinsert_field_f_int(& CHARACTER(LEN=*), INTENT(in) :: field_name INTEGER(hid_t), INTENT(in) :: field_type INTEGER, INTENT(in) :: position -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN TYPE(TYPE), INTENT(in), DIMENSION(*) :: buf #else INTEGER, INTENT(in), DIMENSION(*), TARGET :: buf @@ -922,7 +922,7 @@ SUBROUTINE h5tbinsert_field_f_int(& errcode = h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,position,f_ptr) -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END SUBROUTINE h5tbinsert_field_f #else END SUBROUTINE h5tbinsert_field_f_int @@ -1128,7 +1128,7 @@ END FUNCTION h5tbget_field_info_c END SUBROUTINE h5tbget_field_info_f -#ifdef H5_DOXYGEN_FORTRAN +#ifdef H5_DOXYGEN END MODULE H5TB #else END MODULE H5TB_CONST From aeccaccda31a12e1dcc2446d0ee34d599614174e Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Fri, 21 Oct 2022 18:19:09 -0500 Subject: [PATCH 07/11] reordered multidataset declarations --- src/H5Dpublic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index c2fcd8f2635..83235cb3723 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -1597,11 +1597,11 @@ H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type); #define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dread_multi_async(...) H5Dread_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dwrite_multi_async(...) H5Dwrite_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dwrite_multi_async(...) H5Dwrite_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dread_multi_async(...) H5Dread_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) /* Define "wrapper" versions of function calls, to allow compile-time values to * be passed in by language wrapper or library layer on top of HDF5. @@ -1610,11 +1610,11 @@ H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type); #define H5Dopen_async_wrap H5_NO_EXPAND(H5Dopen_async) #define H5Dget_space_async_wrap H5_NO_EXPAND(H5Dget_space_async) #define H5Dread_async_wrap H5_NO_EXPAND(H5Dread_async) +#define H5Dread_multi_async_wrap H5_NO_EXPAND(5Dread_multi_async) #define H5Dwrite_async_wrap H5_NO_EXPAND(H5Dwrite_async) +#define H5Dwrite_multi_async_wrap H5_NO_EXPAND(H5Dwrite_multi_async) #define H5Dset_extent_async_wrap H5_NO_EXPAND(H5Dset_extent_async) #define H5Dclose_async_wrap H5_NO_EXPAND(H5Dclose_async) -#define H5Dwrite_multi_async_wrap H5_NO_EXPAND(H5Dwrite_multi_async_wrap) -#define H5Dread_multi_async_wrap H5_NO_EXPAND(5Dread_multi_async_wrap) #endif /* H5D_MODULE */ /// \endcond From e90d044fc13c11db797d85dac22c51061fbe9752 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 24 Oct 2022 16:13:09 -0500 Subject: [PATCH 08/11] alt. for H5Aclose_async and H5Acreate_async --- src/H5Apublic.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 52985439e11..8b2ca1123cf 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -90,15 +90,8 @@ extern "C" { */ H5_DLL herr_t H5Aclose(hid_t attr_id); /*--------------------------------------------------------------------------*/ -/** - * \ingroup ASYNC - * \async_variant_of{H5Aclose} - */ -H5_DLL herr_t H5Aclose_async( -#ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, -#endif - hid_t attr_id, hid_t es_id); +H5_DLL herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t attr_id, hid_t es_id); /* --------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -141,14 +134,7 @@ H5_DLL herr_t H5Aclose_async( H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id); /*--------------------------------------------------------------------------*/ -/** - * \ingroup ASYNC - * \async_variant_of{H5Acreate} - */ -H5_DLL hid_t H5Acreate_async( -#ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, -#endif +H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t es_id); /*--------------------------------------------------------------------------*/ @@ -1007,6 +993,21 @@ H5_DLL herr_t H5Awrite_async( H5_DLL herr_t H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id); +#ifdef H5_DOXYGEN +/** + * \ingroup ASYNC + * \async_variant_of{H5Aclose} + */ +H5_DLL herr_t H5Aclose_async(hid_t attr_id, hid_t es_id); +/** + * \ingroup ASYNC + * \async_variant_of{H5Acreate} + */ +H5_DLL hid_t H5Acreate_async( + hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, + hid_t es_id); +#endif + /// \cond DEV /* API Wrappers for async routines */ /* (Must be defined _after_ the function prototype) */ From a76d8c01e50364aa4d796423eca5536088cbd6ac Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 25 Oct 2022 11:32:03 -0500 Subject: [PATCH 09/11] made doxgyen API into seperate blocks --- src/H5Apublic.h | 134 ++++++++++++++++++++++++++++------------------- src/H5Dpublic.h | 118 ++++++++++++++++++++++++----------------- src/H5Fpublic.h | 35 +++++++------ src/H5Gpublic.h | 57 +++++++++++++------- src/H5Lpublic.h | 55 +++++++++++-------- src/H5Mpublic.h | 52 +++++++++++------- src/H5Opublic.h | 64 ++++++++++++++-------- src/H5Rpublic.h | 25 +++++---- src/H5Tpublic.h | 24 +++++---- src/H5VLmodule.h | 3 +- 10 files changed, 349 insertions(+), 218 deletions(-) diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 8b2ca1123cf..0f43ba94aab 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -90,8 +90,16 @@ extern "C" { */ H5_DLL herr_t H5Aclose(hid_t attr_id); /*--------------------------------------------------------------------------*/ -H5_DLL herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, - hid_t attr_id, hid_t es_id); +/** + * \ingroup ASYNC + * \async_variant_of{H5Aclose} + */ +#ifndef H5_DOXYGEN +H5_DLL herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, + hid_t es_id); +#else +H5_DLL herr_t H5Aclose_async(hid_t attr_id, hid_t es_id); +#endif /* --------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -134,9 +142,20 @@ H5_DLL herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigne H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id); /*--------------------------------------------------------------------------*/ -H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, - hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, - hid_t es_id); +/** + * \ingroup ASYNC + * \async_variant_of{H5Acreate} + */ +#ifndef H5_DOXYGEN +H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, + hid_t aapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Acreate_async(hid_t loc_id, + const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, + hid_t aapl_id, hid_t es_id); +#endif + /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -182,12 +201,17 @@ H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *a * \ingroup ASYNC * \async_variant_of{H5Acreate_by_name} */ -H5_DLL hid_t H5Acreate_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, + hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, + hid_t es_id); +#else +H5_DLL hid_t H5Acreate_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, + hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id, + hid_t es_id); #endif - hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, - hid_t aapl_id, hid_t lapl_id, hid_t es_id); + /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -304,11 +328,13 @@ H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name); * \ingroup ASYNC * \async_variant_of{H5Aexists} */ -H5_DLL herr_t H5Aexists_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, + const char *attr_name, hbool_t *exists, hid_t es_id); +#else +H5_DLL herr_t H5Aexists_async(hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); #endif - hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); + /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -345,11 +371,15 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char * * \ingroup ASYNC * \async_variant_of{H5Aexists_by_name} */ -H5_DLL herr_t H5Aexists_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *obj_name, const char *attr_name, + hbool_t *exists, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Aexists_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, + hbool_t *exists, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t *exists, hid_t lapl_id, hid_t es_id); + /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -734,11 +764,12 @@ H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id); * \ingroup ASYNC * \async_variant_of{H5Aopen} */ -H5_DLL hid_t H5Aopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, + const char *attr_name, hid_t aapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Aopen_async(hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); #endif - hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -787,12 +818,15 @@ H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_t * \ingroup ASYNC * \async_variant_of{H5Aopen_by_idx} */ -H5_DLL hid_t H5Aopen_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Aopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, + hid_t aapl_id, hid_t lapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Aopen_by_idx_async(hid_t loc_id, + const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, + hid_t aapl_id, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, - hid_t lapl_id, hid_t es_id); /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -839,11 +873,15 @@ H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *att * \ingroup ASYNC * \async_variant_of{H5Aopen_by_name} */ -H5_DLL hid_t H5Aopen_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Aopen_by_name_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, + hid_t lapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Aopen_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, + hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); + /*-------------------------------------------------------------------------- */ /** * \ingroup H5A @@ -880,11 +918,12 @@ H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf); * \ingroup ASYNC * \async_variant_of{H5Aread} */ -H5_DLL herr_t H5Aread_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Aread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, + hid_t dtype_id, void *buf, hid_t es_id); +#else +H5_DLL herr_t H5Aread_async(chid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); #endif - hid_t attr_id, hid_t dtype_id, void *buf, hid_t es_id); /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -912,22 +951,25 @@ H5_DLL herr_t H5Arename(hid_t loc_id, const char *old_name, const char *new_name * \ingroup ASYNC * \async_variant_of{H5Arename} */ -H5_DLL herr_t H5Arename_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *old_name, const char *new_name, hid_t es_id); +#else +H5_DLL herr_t H5Arename_async(hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); #endif - hid_t loc_id, const char *old_name, const char *new_name, hid_t es_id); /*--------------------------------------------------------------------------*/ /** * \ingroup ASYNC * \async_variant_of{H5Arename_by_name} */ -H5_DLL herr_t H5Arename_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *obj_name, const char *old_attr_name, + const char *new_attr_name, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Arename_by_name_async(hid_t loc_id, const char *obj_name, const char *old_attr_name, + const char *new_attr_name, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id, - hid_t es_id); /*--------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -962,11 +1004,12 @@ H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); * \ingroup ASYNC * \async_variant_of{H5Awrite} */ -H5_DLL herr_t H5Awrite_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id, + hid_t type_id, const void *buf, hid_t es_id); +#else +H5_DLL herr_t H5Awrite_async(hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); #endif - hid_t attr_id, hid_t type_id, const void *buf, hid_t es_id); /*-------------------------------------------------------------------------*/ /** * \ingroup H5A @@ -993,21 +1036,6 @@ H5_DLL herr_t H5Awrite_async( H5_DLL herr_t H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, const char *new_attr_name, hid_t lapl_id); -#ifdef H5_DOXYGEN -/** - * \ingroup ASYNC - * \async_variant_of{H5Aclose} - */ -H5_DLL herr_t H5Aclose_async(hid_t attr_id, hid_t es_id); -/** - * \ingroup ASYNC - * \async_variant_of{H5Acreate} - */ -H5_DLL hid_t H5Acreate_async( - hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, - hid_t es_id); -#endif - /// \cond DEV /* API Wrappers for async routines */ /* (Must be defined _after_ the function prototype) */ diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 83235cb3723..2b63dd44748 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -320,12 +320,16 @@ H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t spa * \ingroup ASYNC * \async_variant_of{H5Dcreate} */ -H5_DLL hid_t H5Dcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, + hid_t dapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Dcreate_async(hid_t loc_id, + const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, + hid_t dapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, - hid_t dapl_id, hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -400,11 +404,13 @@ H5_DLL hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id); * \ingroup ASYNC * \async_variant_of{H5Dopen} */ -H5_DLL hid_t H5Dopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t dapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Dopen_async(hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); + /** * -------------------------------------------------------------------------- *\ingroup H5D @@ -436,11 +442,13 @@ H5_DLL hid_t H5Dget_space(hid_t dset_id); * \ingroup ASYNC * \async_variant_of{H5Dget_space} */ -H5_DLL hid_t H5Dget_space_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, + hid_t es_id); +#else +H5_DLL hid_t H5Dget_space_async(hid_t dset_id,hid_t es_id); #endif - hid_t dset_id, hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -907,23 +915,30 @@ H5_DLL herr_t H5Dread_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], * \ingroup ASYNC * \async_variant_of{H5Dread} */ -H5_DLL herr_t H5Dread_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, + hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, + void *buf /*out*/, hid_t es_id); +#else +H5_DLL herr_t H5Dread_async(hid_t dset_id, + hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, + void *buf /*out*/, hid_t es_id); #endif - hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, - void *buf /*out*/, hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup ASYNC * \async_variant_of{H5Dread_multi} */ -H5_DLL herr_t H5Dread_multi_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dread_multi_async(const char *app_file, const char *app_func, unsigned app_line, size_t count, + hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], + hid_t file_space_id[], hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); +#else +H5_DLL herr_t H5Dread_multi_async(size_t count, + hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], + hid_t file_space_id[], hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); #endif - size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], - hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); /** * -------------------------------------------------------------------------- @@ -1093,23 +1108,29 @@ H5_DLL herr_t H5Dwrite_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], * \ingroup ASYNC * \async_variant_of{H5Dwrite} */ -H5_DLL herr_t H5Dwrite_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, + hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, + const void *buf, hid_t es_id); +#else +H5_DLL herr_t H5Dwrite_async(hid_t dset_id, + hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, + const void *buf, hid_t es_id); #endif - hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, - hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup ASYNC * \async_variant_of{H5Dwrite_multi} */ -H5_DLL herr_t H5Dwrite_multi_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dwrite_multi_async(const char *app_file, const char *app_func, unsigned app_line, + size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], + hid_t file_space_id[], hid_t dxpl_id, const void *buf[], hid_t es_id); +#else +H5_DLL herr_t H5Dwrite_multi_async(size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], + hid_t file_space_id[], hid_t dxpl_id, const void *buf[], hid_t es_id); #endif - size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], - hid_t dxpl_id, const void *buf[], hid_t es_id); /** * -------------------------------------------------------------------------- @@ -1395,11 +1416,13 @@ H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]); * \ingroup ASYNC * \async_variant_of{H5Dset_extent} */ -H5_DLL herr_t H5Dset_extent_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t dset_id, const hsize_t size[], hid_t es_id); +#else +H5_DLL herr_t H5Dset_extent_async(hid_t dset_id, const hsize_t size[], hid_t es_id); #endif - hid_t dset_id, const hsize_t size[], hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup H5D @@ -1576,11 +1599,12 @@ H5_DLL herr_t H5Dclose(hid_t dset_id); * \ingroup ASYNC * \async_variant_of{H5Dclose} */ -H5_DLL herr_t H5Dclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, + hid_t es_id); +#else +H5_DLL herr_t H5Dclose_async(hid_t dset_id, hid_t es_id); #endif - hid_t dset_id, hid_t es_id); /// \cond DEV /* Internal API routines */ H5_DLL herr_t H5Ddebug(hid_t dset_id); @@ -1593,28 +1617,26 @@ H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type); /* (Must be defined _after_ the function prototype) */ /* (And must only defined when included in application code, not the library) */ #ifndef H5D_MODULE -#define H5Dcreate_async(...) H5Dcreate_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dcreate_async(...) H5Dcreate_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dread_multi_async(...) H5Dread_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dwrite_multi_async(...) H5Dwrite_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) /* Define "wrapper" versions of function calls, to allow compile-time values to * be passed in by language wrapper or library layer on top of HDF5. */ -#define H5Dcreate_async_wrap H5_NO_EXPAND(H5Dcreate_async) -#define H5Dopen_async_wrap H5_NO_EXPAND(H5Dopen_async) -#define H5Dget_space_async_wrap H5_NO_EXPAND(H5Dget_space_async) -#define H5Dread_async_wrap H5_NO_EXPAND(H5Dread_async) -#define H5Dread_multi_async_wrap H5_NO_EXPAND(5Dread_multi_async) -#define H5Dwrite_async_wrap H5_NO_EXPAND(H5Dwrite_async) -#define H5Dwrite_multi_async_wrap H5_NO_EXPAND(H5Dwrite_multi_async) -#define H5Dset_extent_async_wrap H5_NO_EXPAND(H5Dset_extent_async) -#define H5Dclose_async_wrap H5_NO_EXPAND(H5Dclose_async) +#define H5Dcreate_async_wrap H5_NO_EXPAND(H5Dcreate_async) +#define H5Dopen_async_wrap H5_NO_EXPAND(H5Dopen_async) +#define H5Dget_space_async_wrap H5_NO_EXPAND(H5Dget_space_async) +#define H5Dread_async_wrap H5_NO_EXPAND(H5Dread_async) +#define H5Dwrite_async_wrap H5_NO_EXPAND(H5Dwrite_async) +#define H5Dset_extent_async_wrap H5_NO_EXPAND(H5Dset_extent_async) +#define H5Dclose_async_wrap H5_NO_EXPAND(H5Dclose_async) #endif /* H5D_MODULE */ /// \endcond diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 38161d36df1..76484f09adf 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -357,11 +357,12 @@ H5_DLL hid_t H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_ * \ingroup ASYNC * \async_variant_of{H5Fcreate} */ -H5_DLL hid_t H5Fcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Fcreate_async(const char *app_file, const char *app_func, unsigned app_line, + const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Fcreate_async(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); #endif - const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t es_id); /** * \ingroup H5F * @@ -460,11 +461,12 @@ H5_DLL hid_t H5Fopen(const char *filename, unsigned flags, hid_t fapl_id); * \ingroup ASYNC * \async_variant_of{H5Fopen} */ -H5_DLL hid_t H5Fopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Fopen_async(const char *app_file, const char *app_func, unsigned app_line, + const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); +#else +H5_DLL hid_t H5Fopen_async(const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); #endif - const char *filename, unsigned flags, hid_t access_plist, hid_t es_id); /** * \ingroup H5F * @@ -496,11 +498,12 @@ H5_DLL hid_t H5Freopen(hid_t file_id); * \ingroup ASYNC * \async_variant_of{H5Freopen} */ -H5_DLL hid_t H5Freopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Freopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t file_id, + hid_t es_id); +#else +H5_DLL hid_t H5Freopen_async(hid_t file_id, hid_t es_id); #endif - hid_t file_id, hid_t es_id); /** * \ingroup H5F * @@ -539,11 +542,12 @@ H5_DLL herr_t H5Fflush(hid_t object_id, H5F_scope_t scope); * \ingroup ASYNC * \async_variant_of{H5Fflush} */ -H5_DLL herr_t H5Fflush_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Fflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id, + H5F_scope_t scope, hid_t es_id); +#else +H5_DLL herr_t H5Fflush_async(hid_t object_id, H5F_scope_t scope, hid_t es_id); #endif - hid_t object_id, H5F_scope_t scope, hid_t es_id); /** * \ingroup H5F * @@ -593,11 +597,12 @@ H5_DLL herr_t H5Fclose(hid_t file_id); * \ingroup ASYNC * \async_variant_of{H5Fclose} */ -H5_DLL herr_t H5Fclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Fclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t file_id, + hid_t es_id); +#else +H5_DLL herr_t H5Fclose_async(hid_t file_id, hid_t es_id); #endif - hid_t file_id, hid_t es_id); /** * \ingroup H5F * diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index ffb43c655f6..481f5aeb19a 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -130,11 +130,14 @@ H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcp * \ingroup ASYNC * \async_variant_of{H5Gcreate} */ -H5_DLL hid_t H5Gcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Gcreate_async(hid_t loc_id, + const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5G @@ -219,11 +222,13 @@ H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id); * \ingroup ASYNC * \async_variant_of{H5Gopen} */ -H5_DLL hid_t H5Gopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t gapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Gopen_async(hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5G @@ -280,11 +285,14 @@ H5_DLL herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo); * \ingroup ASYNC * \async_variant_of{H5Gget_info} */ -H5_DLL herr_t H5Gget_info_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + H5G_info_t *ginfo /*out*/, hid_t es_id); +#else +H5_DLL herr_t H5Gget_info_async(hid_t loc_id, + H5G_info_t *ginfo /*out*/, hid_t es_id); #endif - hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5G @@ -324,11 +332,15 @@ H5_DLL herr_t H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *gi * \ingroup ASYNC * \async_variant_of{H5Gget_info_by_name} */ -H5_DLL herr_t H5Gget_info_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, + hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Gget_info_by_name_async(hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, + hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5G @@ -382,12 +394,17 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_ * \ingroup ASYNC * \async_variant_of{H5Gget_info_by_idx} */ -H5_DLL herr_t H5Gget_info_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *group_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, + hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Gget_info_by_idx_async(hid_t loc_id, const char *group_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, H5G_info_t *ginfo /*out*/, + hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, - H5G_info_t *ginfo /*out*/, hid_t lapl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5G @@ -472,11 +489,13 @@ H5_DLL herr_t H5Gclose(hid_t group_id); * \ingroup ASYNC * \async_variant_of{H5Gclose} */ -H5_DLL herr_t H5Gclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Gclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t group_id, + hid_t es_id); +#else +H5_DLL herr_t H5Gclose_async(hid_t group_id, hid_t es_id); #endif - hid_t group_id, hid_t es_id); + /// \cond DEV /* API Wrappers for async routines */ /* (Must be defined _after_ the function prototype) */ diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 42c7b1a59bd..1cf463afd10 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -294,12 +294,14 @@ H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, * \ingroup ASYNC * \async_variant_of{H5Lcreate_hard} */ -H5_DLL herr_t H5Lcreate_hard_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Lcreate_hard_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, + const char *new_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Lcreate_hard_async(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, + const char *new_name, hid_t lcpl_id, hid_t lapl_id, hid_t es_id); #endif - hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, - hid_t lapl_id, hid_t es_id); /** * \ingroup H5L * @@ -369,12 +371,14 @@ H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const c * \ingroup ASYNC * \async_variant_of{H5Lcreate_soft} */ -H5_DLL herr_t H5Lcreate_soft_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Lcreate_soft_async(const char *app_file, const char *app_func, unsigned app_line, + const char *link_target, hid_t link_loc_id, const char *link_name, + hid_t lcpl_id, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Lcreate_soft_async(const char *link_target, hid_t link_loc_id, const char *link_name, + hid_t lcpl_id, hid_t lapl_id, hid_t es_id); #endif - const char *link_target, hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id, - hid_t es_id); /** * \ingroup H5L * @@ -417,11 +421,12 @@ H5_DLL herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id); * \ingroup ASYNC * \async_variant_of{H5Ldelete} */ -H5_DLL herr_t H5Ldelete_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Ldelete_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Ldelete_async(hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); /** * \ingroup H5L * @@ -455,12 +460,14 @@ H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t * \ingroup ASYNC * \async_variant_of{H5Ldelete_by_idx} */ -H5_DLL herr_t H5Ldelete_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Ldelete_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *group_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Ldelete_by_idx_async(hid_t loc_id, const char *group_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, - hid_t lapl_id, hid_t es_id); /** * \ingroup H5L * @@ -664,11 +671,12 @@ H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id); * \ingroup ASYNC * \async_variant_of{H5Lexists} */ -H5_DLL herr_t H5Lexists_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Lexists_async(hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); /** * \ingroup H5L * @@ -918,12 +926,15 @@ H5_DLL herr_t H5Literate2(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t ord * \ingroup ASYNC * \async_variant_of{H5Literate} */ -H5_DLL herr_t H5Literate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Literate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t group_id, + H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, + void *op_data, hid_t es_id); +#else +H5_DLL herr_t H5Literate_async(hid_t group_id, + H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, + void *op_data, hid_t es_id); #endif - hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, - void *op_data, hid_t es_id); /** * \ingroup TRAV * diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index e507f7edc2b..bb9bb403dd1 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -226,12 +226,16 @@ H5_DLL hid_t H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t * \ingroup ASYNC * \async_variant_of{H5Mcreate} */ -H5_DLL hid_t H5Mcreate_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Mcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, + hid_t mcpl_id, hid_t mapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Mcreate_async(hid_t loc_id, + const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, + hid_t mcpl_id, hid_t mapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, - hid_t mapl_id, hid_t es_id); + /** * \ingroup H5M * @@ -268,11 +272,13 @@ H5_DLL hid_t H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id); * \ingroup ASYNC * \async_variant_of{H5Mopen} */ -H5_DLL hid_t H5Mopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Mopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t mapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Mopen_async(hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); + /** * \ingroup H5M * @@ -296,11 +302,13 @@ H5_DLL herr_t H5Mclose(hid_t map_id); * \ingroup ASYNC * \async_variant_of{H5Mclose} */ -H5_DLL herr_t H5Mclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Mclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, + hid_t es_id); +#else +H5_DLL herr_t H5Mclose_async(hid_t map_id, hid_t es_id); #endif - hid_t map_id, hid_t es_id); + /** * \ingroup H5M * @@ -420,12 +428,16 @@ H5_DLL herr_t H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t * \ingroup ASYNC * \async_variant_of{H5Mput} */ -H5_DLL herr_t H5Mput_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Mput_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, + hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, + hid_t dxpl_id, hid_t es_id); +#else +H5_DLL herr_t H5Mput_async(hid_t map_id, + hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, + hid_t dxpl_id, hid_t es_id); #endif - hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, - hid_t dxpl_id, hid_t es_id); + /** * \ingroup H5M * @@ -463,12 +475,16 @@ H5_DLL herr_t H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t * \ingroup ASYNC * \async_variant_of{H5Mget} */ -H5_DLL herr_t H5Mget_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Mget_async(const char *app_file, const char *app_func, unsigned app_line, hid_t map_id, + hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, + hid_t dxpl_id, hid_t es_id); +#else +H5_DLL herr_t H5Mget_async(hid_t map_id, + hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, + hid_t dxpl_id, hid_t es_id); #endif - hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, - hid_t es_id); + /** * \ingroup H5M * diff --git a/src/H5Opublic.h b/src/H5Opublic.h index bfe979cfd50..e2a927f303c 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -274,11 +274,13 @@ H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id); * \ingroup ASYNC * \async_variant_of{H5Oopen} */ -H5_DLL hid_t H5Oopen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Oopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t lapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Oopen_async(hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5O @@ -360,12 +362,16 @@ H5_DLL hid_t H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx * \ingroup ASYNC * \async_variant_of{H5Oopen_by_idx} */ -H5_DLL hid_t H5Oopen_by_idx_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Oopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *group_name, H5_index_t idx_type, H5_iter_order_t order, + hsize_t n, hid_t lapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Oopen_by_idx_async(hid_t loc_id, + const char *group_name, H5_index_t idx_type, H5_iter_order_t order, + hsize_t n, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, - hid_t lapl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5O @@ -544,11 +550,14 @@ H5_DLL herr_t H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t * * \ingroup ASYNC * \async_variant_of{H5Oget_info_by_name} */ -H5_DLL herr_t H5Oget_info_by_name_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned app_line, + hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, + unsigned fields, hid_t lapl_id, hid_t es_id); +#else +H5_DLL herr_t H5Oget_info_by_name_async(hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, + unsigned fields, hid_t lapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, unsigned fields, hid_t lapl_id, hid_t es_id); /** *------------------------------------------------------------------------- @@ -933,12 +942,16 @@ H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, * \ingroup ASYNC * \async_variant_of{H5Ocopy} */ -H5_DLL herr_t H5Ocopy_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid_t src_loc_id, + const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, + hid_t lcpl_id, hid_t es_id); +#else +H5_DLL herr_t H5Ocopy_async(hid_t src_loc_id, + const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, + hid_t lcpl_id, hid_t es_id); #endif - hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, - hid_t lcpl_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1343,11 +1356,13 @@ H5_DLL herr_t H5Oclose(hid_t object_id); * \ingroup ASYNC * \async_variant_of{H5Oclose} */ -H5_DLL herr_t H5Oclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id, + hid_t es_id); +#else +H5_DLL herr_t H5Oclose_async(hid_t object_id, hid_t es_id); #endif - hid_t object_id, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1385,11 +1400,12 @@ H5_DLL herr_t H5Oflush(hid_t obj_id); * \ingroup ASYNC * \async_variant_of{H5Oflush} */ -H5_DLL herr_t H5Oflush_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, + hid_t es_id); +#else +H5_DLL herr_t H5Oflush_async(hid_t obj_id, hid_t es_id); #endif - hid_t obj_id, hid_t es_id); /** *------------------------------------------------------------------------- * \ingroup H5O @@ -1420,11 +1436,13 @@ H5_DLL herr_t H5Orefresh(hid_t oid); * \ingroup ASYNC * \async_variant_of{H5Orefresh} */ -H5_DLL herr_t H5Orefresh_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line, hid_t oid, + hid_t es_id); +#else +H5_DLL herr_t H5Orefresh_async(hid_t oid, hid_t es_id); #endif - hid_t oid, hid_t es_id); + /** *------------------------------------------------------------------------- * \ingroup H5O diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index 8526db58d23..c4005d02790 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -348,11 +348,14 @@ H5_DLL hid_t H5Ropen_object(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); * \ingroup ASYNC * \async_variant_of{H5Ropen} */ -H5_DLL hid_t H5Ropen_object_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Ropen_object_async(const char *app_file, const char *app_func, unsigned app_line, + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Ropen_object_async(unsigned app_line, + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #endif - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup H5R @@ -391,11 +394,13 @@ H5_DLL hid_t H5Ropen_region(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); * \ingroup ASYNC * \async_variant_of{H5Ropen_region} */ -H5_DLL hid_t H5Ropen_region_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Ropen_region_async(const char *app_file, const char *app_func, unsigned app_line, + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Ropen_region_async(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #endif - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); + /** * -------------------------------------------------------------------------- * \ingroup H5R @@ -431,11 +436,13 @@ H5_DLL hid_t H5Ropen_attr(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id); * \ingroup ASYNC * \async_variant_of{H5Ropen_attr} */ -H5_DLL hid_t H5Ropen_attr_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Ropen_attr_async(const char *app_file, const char *app_func, unsigned app_line, + H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Ropen_attr_async(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); #endif - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id, hid_t es_id); + /* Get type */ /** diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index eecceb5728b..324b643772c 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -1095,11 +1095,12 @@ H5_DLL herr_t H5Tclose(hid_t type_id); * \brief Asynchronous version of H5Tclose(). * */ -H5_DLL herr_t H5Tclose_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, +H5_DLL herr_t H5Tclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t type_id, + hid_t es_id); +#else +H5_DLL herr_t H5Tclose_async(hid_t type_id, hid_t es_id); #endif - unsigned app_line, hid_t type_id, hid_t es_id); /** * \ingroup H5T * @@ -1188,11 +1189,15 @@ H5_DLL herr_t H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lc * \brief Asynchronous version of H5Tcommit2(). * */ -H5_DLL herr_t H5Tcommit_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL herr_t H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, + hid_t es_id); +#else +H5_DLL herr_t H5Tcommit_async(hid_t loc_id, + const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, + hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); /** * -------------------------------------------------------------------------- * \ingroup H5T @@ -1223,11 +1228,12 @@ H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id); * \brief Asynchronous version of H5Topen2(). * */ -H5_DLL hid_t H5Topen_async( #ifndef H5_DOXYGEN - const char *app_file, const char *app_func, unsigned app_line, +H5_DLL hid_t H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, + const char *name, hid_t tapl_id, hid_t es_id); +#else +H5_DLL hid_t H5Topen_async(hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); #endif - hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); /** * \ingroup H5T * diff --git a/src/H5VLmodule.h b/src/H5VLmodule.h index 374ffec2bd2..95f820c723b 100644 --- a/src/H5VLmodule.h +++ b/src/H5VLmodule.h @@ -122,8 +122,7 @@ * * \defgroup ASYNC Asynchronous Functions * \brief List of the asynchronous functions. - * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for - *context. + * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for context. * * \defgroup H5VLDEF Definitions * \ingroup H5VL From f083b35e59e9328ea6198c67d94b9534c8c0a97e Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 25 Oct 2022 11:38:46 -0500 Subject: [PATCH 10/11] updated codespell --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 851277b9a34..f87cbf08d35 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -11,5 +11,5 @@ jobs: - uses: actions/checkout@v2 - uses: codespell-project/actions-codespell@master with: - skip: ./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE + skip: ./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./tools/test/h5repack/testfiles/*.dat ignore_words_list: isnt,inout,nd,parms,parm,ba,offsetP,ser,ois,had,fiter,fo,clude,refere,minnum,offsetp,creat,ans:,eiter,lastr,ans,isn't,ifset,sur,trun,dne,tthe,hda,filname,te,htmp,minnum,ake,gord,numer,ro,oce From ae166dfc7eb1b9e0e48b17074ef2b2288d49c2c3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:44:27 +0000 Subject: [PATCH 11/11] Committing clang-format changes --- src/H5Apublic.h | 17 ++++++++--------- src/H5Dpublic.h | 36 ++++++++++++++++-------------------- src/H5Gpublic.h | 9 ++++----- src/H5Lpublic.h | 5 ++--- src/H5Mpublic.h | 17 +++++++---------- src/H5Opublic.h | 12 +++++------- src/H5Rpublic.h | 4 ++-- src/H5Tpublic.h | 7 +++---- src/H5VLmodule.h | 3 ++- 9 files changed, 49 insertions(+), 61 deletions(-) diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 0f43ba94aab..ebfeea89a79 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -151,9 +151,8 @@ H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigne const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t es_id); #else -H5_DLL hid_t H5Acreate_async(hid_t loc_id, - const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, - hid_t aapl_id, hid_t es_id); +H5_DLL hid_t H5Acreate_async(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, + hid_t acpl_id, hid_t aapl_id, hid_t es_id); #endif /*--------------------------------------------------------------------------*/ @@ -768,7 +767,7 @@ H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id); H5_DLL hid_t H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); #else -H5_DLL hid_t H5Aopen_async(hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); +H5_DLL hid_t H5Aopen_async(hid_t obj_id, const char *attr_name, hid_t aapl_id, hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -823,9 +822,9 @@ H5_DLL hid_t H5Aopen_by_idx_async(const char *app_file, const char *app_func, un const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id, hid_t es_id); #else -H5_DLL hid_t H5Aopen_by_idx_async(hid_t loc_id, - const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, - hid_t aapl_id, hid_t lapl_id, hid_t es_id); +H5_DLL hid_t H5Aopen_by_idx_async(hid_t loc_id, const char *obj_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id, + hid_t es_id); #endif /*--------------------------------------------------------------------------*/ /** @@ -878,8 +877,8 @@ H5_DLL hid_t H5Aopen_by_name_async(const char *app_file, const char *app_func, u hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id, hid_t es_id); #else -H5_DLL hid_t H5Aopen_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, - hid_t lapl_id, hid_t es_id); +H5_DLL hid_t H5Aopen_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, + hid_t lapl_id, hid_t es_id); #endif /*-------------------------------------------------------------------------- */ diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 2b63dd44748..8baf38f198b 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -325,9 +325,8 @@ H5_DLL hid_t H5Dcreate_async(const char *app_file, const char *app_func, unsigne const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t es_id); #else -H5_DLL hid_t H5Dcreate_async(hid_t loc_id, - const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, - hid_t dapl_id, hid_t es_id); +H5_DLL hid_t H5Dcreate_async(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, + hid_t dcpl_id, hid_t dapl_id, hid_t es_id); #endif /** @@ -408,7 +407,7 @@ H5_DLL hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id); H5_DLL hid_t H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); #else -H5_DLL hid_t H5Dopen_async(hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); +H5_DLL hid_t H5Dopen_async(hid_t loc_id, const char *name, hid_t dapl_id, hid_t es_id); #endif /** @@ -446,7 +445,7 @@ H5_DLL hid_t H5Dget_space(hid_t dset_id); H5_DLL hid_t H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id, hid_t es_id); #else -H5_DLL hid_t H5Dget_space_async(hid_t dset_id,hid_t es_id); +H5_DLL hid_t H5Dget_space_async(hid_t dset_id, hid_t es_id); #endif /** @@ -920,9 +919,8 @@ H5_DLL herr_t H5Dread_async(const char *app_file, const char *app_func, unsigned hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf /*out*/, hid_t es_id); #else -H5_DLL herr_t H5Dread_async(hid_t dset_id, - hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, - void *buf /*out*/, hid_t es_id); +H5_DLL herr_t H5Dread_async(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, + hid_t dxpl_id, void *buf /*out*/, hid_t es_id); #endif /** @@ -935,8 +933,7 @@ H5_DLL herr_t H5Dread_multi_async(const char *app_file, const char *app_func, un hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); #else -H5_DLL herr_t H5Dread_multi_async(size_t count, - hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], +H5_DLL herr_t H5Dread_multi_async(size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_space_id[], hid_t file_space_id[], hid_t dxpl_id, void *buf[] /*out*/, hid_t es_id); #endif @@ -1113,9 +1110,8 @@ H5_DLL herr_t H5Dwrite_async(const char *app_file, const char *app_func, unsigne hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, hid_t es_id); #else -H5_DLL herr_t H5Dwrite_async(hid_t dset_id, - hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, - const void *buf, hid_t es_id); +H5_DLL herr_t H5Dwrite_async(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, + hid_t dxpl_id, const void *buf, hid_t es_id); #endif /** @@ -1617,15 +1613,15 @@ H5_DLL herr_t H5Dget_chunk_index_type(hid_t did, H5D_chunk_index_t *idx_type); /* (Must be defined _after_ the function prototype) */ /* (And must only defined when included in application code, not the library) */ #ifndef H5D_MODULE -#define H5Dcreate_async(...) H5Dcreate_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dcreate_async(...) H5Dcreate_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dopen_async(...) H5Dopen_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dget_space_async(...) H5Dget_space_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dread_async(...) H5Dread_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dread_multi_async(...) H5Dread_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dwrite_async(...) H5Dwrite_async(__FILE__, __func__, __LINE__, __VA_ARGS__) #define H5Dwrite_multi_async(...) H5Dwrite_multi_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dset_extent_async(...) H5Dset_extent_async(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define H5Dclose_async(...) H5Dclose_async(__FILE__, __func__, __LINE__, __VA_ARGS__) /* Define "wrapper" versions of function calls, to allow compile-time values to * be passed in by language wrapper or library layer on top of HDF5. diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 481f5aeb19a..fc63871d391 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -134,8 +134,8 @@ H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcp H5_DLL hid_t H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); #else -H5_DLL hid_t H5Gcreate_async(hid_t loc_id, - const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id); +H5_DLL hid_t H5Gcreate_async(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, + hid_t es_id); #endif /** @@ -226,7 +226,7 @@ H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id); H5_DLL hid_t H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); #else -H5_DLL hid_t H5Gopen_async(hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); +H5_DLL hid_t H5Gopen_async(hid_t loc_id, const char *name, hid_t gapl_id, hid_t es_id); #endif /** @@ -289,8 +289,7 @@ H5_DLL herr_t H5Gget_info(hid_t loc_id, H5G_info_t *ginfo); H5_DLL herr_t H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); #else -H5_DLL herr_t H5Gget_info_async(hid_t loc_id, - H5G_info_t *ginfo /*out*/, hid_t es_id); +H5_DLL herr_t H5Gget_info_async(hid_t loc_id, H5G_info_t *ginfo /*out*/, hid_t es_id); #endif /** diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 1cf463afd10..7f4ac0bbadf 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -931,9 +931,8 @@ H5_DLL herr_t H5Literate_async(const char *app_file, const char *app_func, unsig H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, void *op_data, hid_t es_id); #else -H5_DLL herr_t H5Literate_async(hid_t group_id, - H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate2_t op, - void *op_data, hid_t es_id); +H5_DLL herr_t H5Literate_async(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, + H5L_iterate2_t op, void *op_data, hid_t es_id); #endif /** * \ingroup TRAV diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index bb9bb403dd1..1cccf9d218a 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -231,9 +231,8 @@ H5_DLL hid_t H5Mcreate_async(const char *app_file, const char *app_func, unsigne const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id, hid_t es_id); #else -H5_DLL hid_t H5Mcreate_async(hid_t loc_id, - const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, - hid_t mcpl_id, hid_t mapl_id, hid_t es_id); +H5_DLL hid_t H5Mcreate_async(hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, + hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id, hid_t es_id); #endif /** @@ -276,7 +275,7 @@ H5_DLL hid_t H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id); H5_DLL hid_t H5Mopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); #else -H5_DLL hid_t H5Mopen_async(hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); +H5_DLL hid_t H5Mopen_async(hid_t loc_id, const char *name, hid_t mapl_id, hid_t es_id); #endif /** @@ -433,9 +432,8 @@ H5_DLL herr_t H5Mput_async(const char *app_file, const char *app_func, unsigned hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id, hid_t es_id); #else -H5_DLL herr_t H5Mput_async(hid_t map_id, - hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, - hid_t dxpl_id, hid_t es_id); +H5_DLL herr_t H5Mput_async(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, + const void *value, hid_t dxpl_id, hid_t es_id); #endif /** @@ -480,9 +478,8 @@ H5_DLL herr_t H5Mget_async(const char *app_file, const char *app_func, unsigned hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id, hid_t es_id); #else -H5_DLL herr_t H5Mget_async(hid_t map_id, - hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, - hid_t dxpl_id, hid_t es_id); +H5_DLL herr_t H5Mget_async(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, + void *value, hid_t dxpl_id, hid_t es_id); #endif /** diff --git a/src/H5Opublic.h b/src/H5Opublic.h index e2a927f303c..93472c3d508 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -278,7 +278,7 @@ H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id); H5_DLL hid_t H5Oopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #else -H5_DLL hid_t H5Oopen_async(hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); +H5_DLL hid_t H5Oopen_async(hid_t loc_id, const char *name, hid_t lapl_id, hid_t es_id); #endif /** @@ -367,9 +367,8 @@ H5_DLL hid_t H5Oopen_by_idx_async(const char *app_file, const char *app_func, un const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); #else -H5_DLL hid_t H5Oopen_by_idx_async(hid_t loc_id, - const char *group_name, H5_index_t idx_type, H5_iter_order_t order, - hsize_t n, hid_t lapl_id, hid_t es_id); +H5_DLL hid_t H5Oopen_by_idx_async(hid_t loc_id, const char *group_name, H5_index_t idx_type, + H5_iter_order_t order, hsize_t n, hid_t lapl_id, hid_t es_id); #endif /** @@ -947,9 +946,8 @@ H5_DLL herr_t H5Ocopy_async(const char *app_file, const char *app_func, unsigned const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t es_id); #else -H5_DLL herr_t H5Ocopy_async(hid_t src_loc_id, - const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, - hid_t lcpl_id, hid_t es_id); +H5_DLL herr_t H5Ocopy_async(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, + hid_t ocpypl_id, hid_t lcpl_id, hid_t es_id); #endif /** diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index c4005d02790..b925aef71ce 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -352,8 +352,8 @@ H5_DLL hid_t H5Ropen_object(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id); H5_DLL hid_t H5Ropen_object_async(const char *app_file, const char *app_func, unsigned app_line, H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); #else -H5_DLL hid_t H5Ropen_object_async(unsigned app_line, - H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, hid_t es_id); +H5_DLL hid_t H5Ropen_object_async(unsigned app_line, H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id, + hid_t es_id); #endif /** diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index 324b643772c..a15d22ed3f4 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -1194,9 +1194,8 @@ H5_DLL herr_t H5Tcommit_async(const char *app_file, const char *app_func, unsign const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t es_id); #else -H5_DLL herr_t H5Tcommit_async(hid_t loc_id, - const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, - hid_t es_id); +H5_DLL herr_t H5Tcommit_async(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, + hid_t tapl_id, hid_t es_id); #endif /** * -------------------------------------------------------------------------- @@ -1232,7 +1231,7 @@ H5_DLL hid_t H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id); H5_DLL hid_t H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); #else -H5_DLL hid_t H5Topen_async(hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); +H5_DLL hid_t H5Topen_async(hid_t loc_id, const char *name, hid_t tapl_id, hid_t es_id); #endif /** * \ingroup H5T diff --git a/src/H5VLmodule.h b/src/H5VLmodule.h index 95f820c723b..374ffec2bd2 100644 --- a/src/H5VLmodule.h +++ b/src/H5VLmodule.h @@ -122,7 +122,8 @@ * * \defgroup ASYNC Asynchronous Functions * \brief List of the asynchronous functions. - * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for context. + * \note The argument \p es_id associated with the asynchronous APIs is the \Emph{event set id}. See H5ES for + *context. * * \defgroup H5VLDEF Definitions * \ingroup H5VL