From 82efd075e931fec3747b55d25a007e2833efdafb Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 8 Nov 2016 22:30:11 +0000 Subject: [PATCH] Fix some size_t / uint32_t ambiguity errors. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286305 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/DebugInfo/CodeView/TypeRecordMapping.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/DebugInfo/CodeView/TypeRecordMapping.cpp b/lib/DebugInfo/CodeView/TypeRecordMapping.cpp index f260ddad3fd..f46e08d5542 100644 --- a/lib/DebugInfo/CodeView/TypeRecordMapping.cpp +++ b/lib/DebugInfo/CodeView/TypeRecordMapping.cpp @@ -50,15 +50,15 @@ static Error mapNameAndUniqueName(CodeViewRecordIO &IO, StringRef &Name, // Try to be smart about what we write here. We can't write anything too // large, so if we're going to go over the limit, truncate both the name // and unique name by the same amount. - uint32_t BytesLeft = IO.maxFieldLength(); + size_t BytesLeft = IO.maxFieldLength(); if (HasUniqueName) { - uint32_t BytesNeeded = Name.size() + UniqueName.size() + 2; + size_t BytesNeeded = Name.size() + UniqueName.size() + 2; StringRef N = Name; StringRef U = UniqueName; if (BytesNeeded > BytesLeft) { - uint32_t BytesToDrop = (BytesNeeded - BytesLeft); - uint32_t DropN = std::min(N.size(), BytesToDrop / 2); - uint32_t DropU = std::min(U.size(), BytesToDrop - DropN); + size_t BytesToDrop = (BytesNeeded - BytesLeft); + size_t DropN = std::min(N.size(), BytesToDrop / 2); + size_t DropU = std::min(U.size(), BytesToDrop - DropN); N = N.drop_back(DropN); U = U.drop_back(DropU); @@ -67,10 +67,10 @@ static Error mapNameAndUniqueName(CodeViewRecordIO &IO, StringRef &Name, error(IO.mapStringZ(N)); error(IO.mapStringZ(U)); } else { - uint32_t BytesNeeded = Name.size() + 1; + size_t BytesNeeded = Name.size() + 1; StringRef N = Name; if (BytesNeeded > BytesLeft) { - uint32_t BytesToDrop = std::min(N.size(), BytesToDrop); + size_t BytesToDrop = std::min(N.size(), BytesToDrop); N = N.drop_back(BytesToDrop); } error(IO.mapStringZ(N)); -- 2.50.1