Merge pull request #6719 from cenit/dev/cenit/llvm12

fix compatibility with newer clang