Fix clang 10 build warnings (@chasse)

Marco Cattaneorequested to merge
cherry-pick-694f35b1 into run2-patches

See merge request !736 (merged) (cherry picked from commit 694f35b1)

Edited by Marco Cattaneo

Merge request reports