Fix -Wall with icc

Requesting a pull to Eyescale:master from tribal-tec:master