Merge pull request #190 from svost/msvc-warning
authorCryptoManiac <CryptoManiac@users.noreply.github.com>
Wed, 1 Apr 2015 16:16:56 +0000 (19:16 +0300)
committerCryptoManiac <CryptoManiac@users.noreply.github.com>
Wed, 1 Apr 2015 16:16:56 +0000 (19:16 +0300)
Remove MSVC warning - memcpy uses size_t variable

src/serialize.h

index f579c58..a1f8a0e 100644 (file)
@@ -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;