Merge pull request #1545 from hzeller/20221206-fix-c++20 Fix C++20-incompatible instances of aggregate initialization