Compilation error corrected on 32bits platforms.
Reintegrating [4.0] branch.