Build breaks in msvc 2010/12/13.

This resolves a break and warning in the main library although two link errors remain in the msvc self-test project.