Fix a compilation issue with VS10.
Merge pull request #1238 from gupascal/master

Fix a compilation issue with VS10.