Fix C++17 warnings for a couple of post-merge items
Issue/feature addressed
This MR fixes a couple of files which should have been adjusted by clang-tidy
post merge of !1556 (merged).
Proposed solution
Apply the proposed patches.
Checklist
-
[ ] Functions and classes, or changes to them, are documented. [ ] User guide/documentation is updated.-
Changelog is updated. [ ] Suitable tests added for new functionality.-
Contributed code is correctly formatted. (See the contributing guidelines). [ ] License added to any new files.[ ] No extraneous files have been added (e.g. compiler output or test data files).