More code changes for adapting to older compilers.

1 job for closed-issue1 in 12 minutes and 28 seconds
latest