From: Jianzhou Zhao Date: Thu, 17 Sep 2020 04:02:19 +0000 (+0000) Subject: Fix the arguments of std::min X-Git-Tag: llvmorg-13-init~11786 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aec80c5cfd1bda8e630fca0f3ed2a84659f68635;p=platform%2Fupstream%2Fllvm.git Fix the arguments of std::min fixing https://github.com/llvm/llvm-project/commit/11201315d5881a135faa5aa87f415ce03f99eb96 --- diff --git a/llvm/include/llvm/Bitstream/BitstreamWriter.h b/llvm/include/llvm/Bitstream/BitstreamWriter.h index d5593d6e..8dc135e 100644 --- a/llvm/include/llvm/Bitstream/BitstreamWriter.h +++ b/llvm/include/llvm/Bitstream/BitstreamWriter.h @@ -158,7 +158,7 @@ public: // Copy data to update into Bytes from the file FS and the buffer Out. char Bytes[8]; size_t BytesNum = StartBit ? 8 : 4; - size_t BytesFromDisk = std::min(BytesNum, NumOfFlushedBytes - ByteNo); + size_t BytesFromDisk = std::min(static_cast(BytesNum), NumOfFlushedBytes - ByteNo); size_t BytesFromBuffer = BytesNum - BytesFromDisk; // When unaligned, copy existing data into Bytes from the file FS and the