From f67cc7af25c9803d1df0d0d2794b4f802727537e Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 14 Jun 2017 16:12:07 +0100 Subject: [PATCH] Fix broken Windows build. Was broken on MSVC 2013, due to a compiler bug. --- src/TrackPanel.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/TrackPanel.h b/src/TrackPanel.h index ed7de67ee..524ae6ac0 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -234,10 +234,14 @@ private: TrackPanel * pParent; static wxFont gFont; - static std::unique_ptr - gGainCaptured, gPanCaptured, gGain, gPan; + // These are on separate lines to work around an MSVC 2013 compiler bug. + static std::unique_ptr gGainCaptured; + static std::unique_ptr gPanCaptured; + static std::unique_ptr gGain; + static std::unique_ptr gPan; #ifdef EXPERIMENTAL_MIDI_OUT - static std::unique_ptr gVelocityCaptured, gVelocity; + static std::unique_ptr gVelocityCaptured; + static std::unique_ptr gVelocity; #endif friend class TrackPanel;