Comment 19 for bug 1848488

@Fabien-

Thank you for your patch. I've pushed it to the master branch but reset the status to in-progress as it needs to be cherry-picked into 5.1.6 when that branch is opened.

There were some formatting issues in your patch that I addressed in a follow-on patch. The follow-on was something of a rabbit-hole as it exposed our left-over routines from years past that we've been patching over for a while.

When this is cherry-picked, we should remember to touch-up the formatting at the same time.

For future reference, C-style casts are discouraged (I know, they are everywhere still). Instead, please use static_cast<TYPE>() or dynamic_cast<TYPE>() and spaces go inside all parentheses.