From 9f6956bd87a776ca11ebee253a794dcc5d54072b Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 19 Feb 2019 21:40:42 -0500 Subject: [PATCH] Awards default values to `Scan`, to appease GCC 7.3. --- Outputs/CRT/CRT.hpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Outputs/CRT/CRT.hpp b/Outputs/CRT/CRT.hpp index 194eecf9a..41e96f3a4 100644 --- a/Outputs/CRT/CRT.hpp +++ b/Outputs/CRT/CRT.hpp @@ -47,13 +47,9 @@ class CRT { struct Scan { enum Type { Sync, Level, Data, Blank, ColourBurst - } type; - int number_of_cycles, number_of_samples; - union { - struct { - uint8_t phase, amplitude; - }; - }; + } type = Scan::Blank; + int number_of_cycles = 0, number_of_samples = 0; + uint8_t phase = 0, amplitude = 0; }; void output_scan(const Scan *scan);