Fix build with Clang 10

Merged François Grisez requested to merge fix/build_clang_10 into release/4.4

(cherry picked from commit d71429b8)

Merge request reports