Fix build failure with C++20.
I am fixing this deliberately also in 23.0 since that's where the bug got introduced by !64255 (merged).
Frank Winklmeier authored