I tested this and can confirm it does allow the build to complete.

This seems to be the same workaround as in #14452, which is just to suppress the -Wold-style-cast warnings. Is this the preferred thing to do? Or would it be better to change the casts?

If suppressing the warning is fine, should I make a PR separate to Nastys' one that fixes the same issue on those other files? (That PR is larger and seems to have stalled).

For context, building from Master normally fails on Apple Clang, but I have a build script that adds in Nastys' workaround to the code before building.

We can't really change the casts as those are system or library headers.
Added the ones from Nastys' PR to this PR.

We can't really change the casts as those are system or library headers. Added the ones from Nastys' PR to this PR.

Ok, I see.

I gave this a test and I'm getting a failure on display_sleep_control.cpp
Output (fail).txt

Should be fixed.

Yep, I can confirm it's fixed.

Thanks. 👍🏼