From a5c0d1ec77d75d77960736757cbc00075b1bd233 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 29 Aug 2007 16:32:50 +0000 Subject: [PATCH] Silence implicit 64->32-bit conversion warnings. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41567 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Instructions.h | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h index 2913341cb89..328932acac1 100644 --- a/include/llvm/Instructions.h +++ b/include/llvm/Instructions.h @@ -762,17 +762,10 @@ class CallInst : public Instruction { // This argument ensures that we have an iterator we can // do arithmetic on in constant time std::random_access_iterator_tag) { - typename std::iterator_traits::difference_type NumArgs = - std::distance(ArgBegin, ArgEnd); - - if (NumArgs > 0) { - // This requires that the iterator points to contiguous memory. - init(Func, &*ArgBegin, NumArgs); - } - else { - init(Func, 0, NumArgs); - } + unsigned NumArgs = (unsigned)std::distance(ArgBegin, ArgEnd); + // This requires that the iterator points to contiguous memory. + init(Func, NumArgs ? &*ArgBegin : 0, NumArgs); setName(Name); } @@ -1552,17 +1545,10 @@ class InvokeInst : public TerminatorInst { // This argument ensures that we have an iterator we can // do arithmetic on in constant time std::random_access_iterator_tag) { - typename std::iterator_traits::difference_type NumArgs = - std::distance(ArgBegin, ArgEnd); - - if (NumArgs > 0) { - // This requires that the iterator points to contiguous memory. - init(Func, IfNormal, IfException, &*ArgBegin, NumArgs); - } - else { - init(Func, IfNormal, IfException, 0, NumArgs); - } + unsigned NumArgs = (unsigned)std::distance(ArgBegin, ArgEnd); + // This requires that the iterator points to contiguous memory. + init(Func, IfNormal, IfException, NumArgs ? &*ArgBegin : 0, NumArgs); setName(Name); }