From 67736594f7cc1f789060a89f0bc981b58b66bca1 Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Tue, 2 May 2017 23:41:51 +0000
Subject: [PATCH] Fix type conversion error.

llvm-svn: 301987
---
 llvm/lib/DebugInfo/CodeView/StringTable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/lib/DebugInfo/CodeView/StringTable.cpp b/llvm/lib/DebugInfo/CodeView/StringTable.cpp
index 49e2fe3..5d3a0dd 100644
--- a/llvm/lib/DebugInfo/CodeView/StringTable.cpp
+++ b/llvm/lib/DebugInfo/CodeView/StringTable.cpp
@@ -54,7 +54,7 @@ Error StringTable::commit(BinaryStreamWriter &Writer) const {
     Writer.setOffset(Offset);
     if (auto EC = Writer.writeCString(S))
       return EC;
-    MaxOffset = std::max(MaxOffset, Offset + S.size() + 1);
+    MaxOffset = std::max<uint32_t>(MaxOffset, Offset + S.size() + 1);
   }
 
   Writer.setOffset(MaxOffset);
-- 
2.7.4