Fixing code that doesn't compile in MSVC 2012 (but does in MSVC 2013) from r204417 and related commits.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@204471 91177308-0d34-0410-b5e6-96231b3b80d8