Add a number of compilation fixes for MSVC svn path=/branches/cmake-bringup/; revision=49598
svn path=/branches/cmake-bringup/; revision=48236