From: CryptoManiac Date: Wed, 1 Apr 2015 16:16:56 +0000 (+0300) Subject: Merge pull request #190 from svost/msvc-warning X-Git-Tag: nvc-v0.5.3~53 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=28fdb061d3af424edea93c095219a5862fffba7c;hp=f94944911d5d71f4959f202e7c7c7a733a325ec2 Merge pull request #190 from svost/msvc-warning Remove MSVC warning - memcpy uses size_t variable --- diff --git a/src/serialize.h b/src/serialize.h index f579c58..a1f8a0e 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1360,9 +1360,9 @@ public: unsigned int pos = (unsigned int)(nReadPos % vchBuf.size()); size_t nNow = nSize; if (nNow + pos > vchBuf.size()) - nNow = vchBuf.size() - pos; + nNow = (size_t)(vchBuf.size() - pos); if (nNow + nReadPos > nSrcPos) - nNow = nSrcPos - nReadPos; + nNow = (size_t)(nSrcPos - nReadPos); memcpy(pch, &vchBuf[pos], nNow); nReadPos += nNow; pch += nNow;