From 60ae910faf01025ed0fbbfcd95e5a9bef5422060 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 7 Feb 2021 00:18:47 +0100 Subject: [PATCH] Corrected a compile error on gcc 9.3 Removed the leak detector, which allows for POD data structures with no default functions. This way the `noexcept` specifier on the `atomic_queue` is actually valid, since the `FileTime` and `CallbackTime` objects can be built without throwing. --- src/sfizz/Logger.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/sfizz/Logger.h b/src/sfizz/Logger.h index de7e8beb..4e39471b 100644 --- a/src/sfizz/Logger.h +++ b/src/sfizz/Logger.h @@ -48,18 +48,10 @@ struct ScopedTiming struct FileTime { - FileTime() = default; - FileTime(Duration waitDuration, Duration loadDuration, uint32_t fileSize, absl::string_view filename) - : waitDuration(waitDuration), loadDuration(loadDuration), fileSize(fileSize), filename(filename) { } - FileTime(const FileTime&) = default; - FileTime& operator=(const FileTime&) = default; - FileTime(FileTime&&) = default; - FileTime& operator=(FileTime&&) = default; Duration waitDuration { 0 }; Duration loadDuration { 0 }; uint32_t fileSize { 0 }; absl::string_view filename {}; - LEAK_DETECTOR(FileTime); }; struct CallbackBreakdown @@ -71,22 +63,13 @@ struct CallbackBreakdown Duration filters { 0 }; Duration panning { 0 }; Duration effects { 0 }; - LEAK_DETECTOR(CallbackBreakdown); }; struct CallbackTime { - CallbackTime() = default; - CallbackTime(const CallbackBreakdown& breakdown, int numVoices, size_t numSamples) - : breakdown(breakdown), numVoices(numVoices), numSamples(numSamples) { } - CallbackTime(const CallbackTime&) = default; - CallbackTime& operator=(const CallbackTime&) = default; - CallbackTime(CallbackTime&&) = default; - CallbackTime& operator=(CallbackTime&&) = default; CallbackBreakdown breakdown {}; int numVoices { 0 }; size_t numSamples { 0 }; - LEAK_DETECTOR(CallbackTime); }; class Logger