It didn't compile, so I fear it other code bases will have to make the change too. I don't know of a solution though. 2.10 is just more strict.
The truth is one of those involved told me later that anything that breaks in 2.10 should be filed as a (potential) bug, but I didn't know that. Too late now.