Fix warnings svn path=/branches/cmake-bringup/; revision=49532
svn path=/branches/cmake-bringup/; revision=48236