From 57c68d144e21b7c683de057f9c89a0045ba06a23 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 8 Jan 2018 15:20:48 -0500 Subject: [PATCH] Revert "A more elegant fix of an (incorrect) MSVC compiler warning..." Because it might be what make AppVeyor choke. This reverts commit 2c3331424b33154b40c4c75e479659e41f0e871f. --- src/TrackPanelDrawingContext.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/TrackPanelDrawingContext.h b/src/TrackPanelDrawingContext.h index 79c656090..e9f29bae4 100644 --- a/src/TrackPanelDrawingContext.h +++ b/src/TrackPanelDrawingContext.h @@ -19,13 +19,19 @@ class wxDC; #include +// MSVC 2013 says this can't be instantiated - but in fact it can +// using {} syntax. +// As it's a bogus warning caused by a bug in MSVC2013, it's Ok to disable it. +#pragma warning( push ) +#pragma warning( disable : 4510) +#pragma warning( disable : 4610) + struct TrackPanelDrawingContext { wxDC &dc; UIHandlePtr target; wxMouseState lastState; - - // This redundancy fixes an MSVC compiler warning: - TrackPanelDrawingContext() = delete; }; +#pragma warning( pop ) + #endif