From 2584263f35f4057e5fb95932de20941014b7f525 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Mon, 17 May 2021 07:07:13 -0500 Subject: [PATCH 1/3] Revert addition of & to 2 parameters in DSetCreatPropList::setVirtual from PR #448 Various clang tidy warning fixes, to maintain binary compatibility in hdf5_1_12. --- c++/src/H5DcreatProp.cpp | 4 ++-- c++/src/H5DcreatProp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp index 383e38faed4..4c71d5ece90 100644 --- a/c++/src/H5DcreatProp.cpp +++ b/c++/src/H5DcreatProp.cpp @@ -775,8 +775,8 @@ DSetCreatPropList::setVirtual(const DataSpace &vspace, const char *src_fname, co // Programmer Binh-Minh Ribler - Mar, 2017 //-------------------------------------------------------------------------- void -DSetCreatPropList::setVirtual(const DataSpace &vspace, const H5std_string &src_fname, - const H5std_string &src_dsname, const DataSpace &sspace) const +DSetCreatPropList::setVirtual(const DataSpace &vspace, const H5std_string src_fname, + const H5std_string src_dsname, const DataSpace &sspace) const { setVirtual(vspace, src_fname.c_str(), src_dsname.c_str(), sspace); } diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h index 820c0d1df19..3c032ee5c6d 100644 --- a/c++/src/H5DcreatProp.h +++ b/c++/src/H5DcreatProp.h @@ -123,7 +123,7 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList { // Maps elements of a virtual dataset to elements of the source dataset. void setVirtual(const DataSpace &vspace, const char *src_fname, const char *src_dsname, const DataSpace &sspace) const; - void setVirtual(const DataSpace &vspace, const H5std_string &src_fname, const H5std_string &src_dsname, + void setVirtual(const DataSpace &vspace, const H5std_string src_fname, const H5std_string src_dsname, const DataSpace &sspace) const; ///\brief Returns this class name. From 99dc1ad91879a213eac83a87abb5f935e09e9d32 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Tue, 18 May 2021 00:35:22 -0500 Subject: [PATCH 2/3] Commit H5Trace3 macro change for code change merged from develop. --- src/H5E.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5E.c b/src/H5E.c index c5ba26e2b4e..bcadd6333f9 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -1547,7 +1547,7 @@ H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE3("e", "ixx", estack_id, func, client_data); + H5TRACE3("e", "i*x**x", estack_id, func, client_data); if (estack_id == H5E_DEFAULT) { if (NULL == (estack = H5E__get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in From 0efef9d299c3966a5b27922c5d62260bd77ed7c5 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Tue, 18 May 2021 07:21:18 -0500 Subject: [PATCH 3/3] Enable maintainer mode. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1b4e6adfcb2..f5b18591121 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # use silent rules where a ## ## By default, it is enabled. Users can configure with ## --disable-maintainer-mode to prevent running the autotools. -AM_MAINTAINER_MODE([disable]) +AM_MAINTAINER_MODE([enable]) ## ---------------------------------------------------------------------- ## Set prefix default (install directory) to a directory in the build area.