From fe5e84c28e02800d66d4b1993d3af6ed15009994 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 16 Dec 2012 02:33:47 +0100 Subject: [PATCH] Fixed some warnings Signed-off-by: Sven Strickroth --- src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp | 2 +- src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp | 2 +- src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp | 3 +++ src/TortoiseProc/RevisionGraph/RevisionGraphWnd.h | 6 ++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp index 64ef360b2..91618d091 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp @@ -529,7 +529,7 @@ void CRevisionGraphDlg::UpdateFullHistory() #endif } -void CRevisionGraphDlg::SetOption (UINT controlID) +void CRevisionGraphDlg::SetOption (UINT /*controlID*/) { #if 0 CMenu * pMenu = GetMenu(); diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp index 78352c474..c73cb5973 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp @@ -1108,7 +1108,7 @@ void CRevisionGraphWnd::DrawConnections (GraphicsDevice& graphics, const CRect& arrows[4].Y = points[0].Y; path.AddLines(arrows, 5); - path.SetFillMode(FillMode::FillModeAlternate); + path.SetFillMode(FillModeAlternate); graphics.graphics->DrawPath(&pen, &path); } diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp index e27b49973..add14e186 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp @@ -42,11 +42,14 @@ #include "SysInfo.h" #include "FormatMessageWrapper.h" +#pragma warning(push) +#pragma warning(disable: 4100) // unreferenced formal parameter #include #include #include #include #include +#pragma warning(pop) #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.h b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.h index 5a74b88ad..e2704be83 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.h +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.h @@ -19,7 +19,10 @@ // #pragma once //#include "RevisionGraph/RevisionGraphState.h" +#pragma warning(push) +#pragma warning(disable: 4481) // nonstandard extension used: override specifier 'override' #include "Future.h" +#pragma warning(pop) #include "ProgressDlg.h" #include "Colors.h" //#include "SVNDiff.h" @@ -27,11 +30,14 @@ #include "SVG.h" #include "LogDlgHelper.h" +#pragma warning(push) +#pragma warning(disable: 4100) // unreferenced formal parameter #include #include #include #include #include +#pragma warning(pop) typedef void CVisibleGraphNode; typedef int index_t; -- 2.11.4.GIT