Fix build with Clang 10

Merged François Grisez requested to merge hotfix/build_clang_10 into release/4.3

(cherry picked from commit 7d6317ef)

Merge request reports