From 3045767c7fc8ce32442fa38876e611ace2bed229 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Thu, 20 Feb 2014 09:16:23 +0000
Subject: COFFObjectFile.cpp: Appease msvc in r201760.

llvm-svn: 201769
---
 llvm/lib/Object/COFFObjectFile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'llvm/lib/Object/COFFObjectFile.cpp')

diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp
index 85b2f0b91d7..ede784379f2 100644
--- a/llvm/lib/Object/COFFObjectFile.cpp
+++ b/llvm/lib/Object/COFFObjectFile.cpp
@@ -383,7 +383,7 @@ error_code COFFObjectFile::initSymbolTablePtr() {
 
 // Returns the file offset for the given VA.
 error_code COFFObjectFile::getVaPtr(uint32_t Addr, uintptr_t &Res) const {
-  uint32_t ImageBase = PE32Header ? PE32Header->ImageBase : PE32PlusHeader->ImageBase;
+  uint32_t ImageBase = PE32Header ? PE32Header->ImageBase : (uint32_t)PE32PlusHeader->ImageBase;
   return getRvaPtr(Addr - ImageBase, Res);
 }
 
-- 
cgit v1.2.3