From a9dc335d67609699db071672f90155153d956dfe Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 17 Oct 2014 18:25:54 +0200 Subject: [PATCH] Fix warnings Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitProgressList.cpp | 2 +- src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp index 89a1337c1..4b156f8c2 100644 --- a/src/TortoiseProc/GitProgressList.cpp +++ b/src/TortoiseProc/GitProgressList.cpp @@ -340,7 +340,7 @@ void CGitProgressList::ResizeColumns() for (int col = 0; col <= maxcol; ++col) { // find the longest width of all items - int count = min(m_arData.size(), GetItemCount()); + int count = min((int)m_arData.size(), GetItemCount()); HDITEM hdi = {0}; hdi.mask = HDI_TEXT; hdi.pszText = textbuf; diff --git a/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp b/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp index 978db07e8..c8d9117ac 100644 --- a/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp +++ b/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp @@ -54,8 +54,8 @@ bool ResetProgressCommand::Run(CGitProgressList* list, CString& sWindowTitle, in checkout_options.progress_cb = [](const char* path, size_t completed_steps, size_t total_steps, void* payload) { CGitProgressList::Payload* cbpayload = (CGitProgressList::Payload*)payload; - cbpayload->list->m_itemCountTotal = total_steps; - cbpayload->list->m_itemCount = completed_steps; + cbpayload->list->m_itemCountTotal = (int)total_steps; + cbpayload->list->m_itemCount = (int)completed_steps; cbpayload->list->AddNotify(new CGitProgressList::WC_File_NotificationData(CUnicodeUtils::GetUnicode(path), CGitProgressList::WC_File_NotificationData::git_wc_notify_checkout)); }; if (git_reset(repo, target, (git_reset_t)(m_resetType + 1), &checkout_options, nullptr, nullptr)) -- 2.11.4.GIT