From 5302dacf3de926fe50ee2ccb8dd4efcf58de7855 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 13 Jan 2018 14:04:25 -0500 Subject: [PATCH] Revert the reversion of the elegant fix of wrong MSVC compiler warning This reverts commit 57c68d144e21b7c683de057f9c89a0045ba06a23. --- src/TrackPanelDrawingContext.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/TrackPanelDrawingContext.h b/src/TrackPanelDrawingContext.h index e9f29bae4..79c656090 100644 --- a/src/TrackPanelDrawingContext.h +++ b/src/TrackPanelDrawingContext.h @@ -19,19 +19,13 @@ 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