From 35d53cc54ae590fad75cf9fa038c0e0568157f7e Mon Sep 17 00:00:00 2001 From: svost Date: Thu, 1 Oct 2015 15:17:50 +0300 Subject: [PATCH] Get rid of some msvc c4267 warnings --- src/addrman.cpp | 2 +- src/bitcoinrpc.cpp | 2 +- src/main.cpp | 2 +- src/net.cpp | 2 +- src/util.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/addrman.cpp b/src/addrman.cpp index 54f9a61..a7615ed 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -493,7 +493,7 @@ int CAddrMan::Check_() void CAddrMan::GetAddr_(std::vector &vAddr) { - int nNodes = ADDRMAN_GETADDR_MAX_PCT*vRandom.size()/100; + size_t nNodes = ADDRMAN_GETADDR_MAX_PCT*vRandom.size()/100; if (nNodes > ADDRMAN_GETADDR_MAX) nNodes = ADDRMAN_GETADDR_MAX; diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 8e21521..89592f3 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1181,7 +1181,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector= 0; i--) + for (size_t i = vtx.size()-1; i >= 0; i--) if (!vtx[i].DisconnectInputs(txdb)) return false; diff --git a/src/net.cpp b/src/net.cpp index 6f45e2d..add7c91 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -617,7 +617,7 @@ static list vNodesDisconnected; void ThreadSocketHandler2(void* parg) { printf("ThreadSocketHandler started\n"); - unsigned int nPrevNodeCount = 0; + size_t nPrevNodeCount = 0; while (true) { // diff --git a/src/util.cpp b/src/util.cpp index 8f896d7..f6d80f7 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -293,7 +293,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...) buffer += vstrprintf(pszFormat, arg_ptr); va_end(arg_ptr); - int line_start = 0, line_end; + size_t line_start = 0, line_end; while((line_end = buffer.find('\n', line_start)) != -1) { OutputDebugStringA(buffer.substr(line_start, line_end - line_start).c_str()); @@ -401,7 +401,7 @@ string FormatMoney(int64_t n, bool fPlus) // Right-trim excess zeros before the decimal point: int nTrim = 0; - for (int i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) + for (size_t i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) ++nTrim; if (nTrim) str.erase(str.size()-nTrim, nTrim); -- 1.7.1