Another compilation fix with ICC/MSVC combo
(grafted from b144204d15d7c259ddcd4dab0f7724d3a8f7e262)

--HG--
branch : 3.2
extra : source : b144204d15d7c259ddcd4dab0f7724d3a8f7e262