Merge pull request #632 from paulfd/noexcept-compile-error

Corrected a compile error on gcc 9.3
sfztools · Feb 12, 2021 · da41ed5 · da41ed5
2 parents f9eb818 + a7cfb84
commit da41ed5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/src/sfizz/Logger.cpp b/src/sfizz/Logger.cpp
@@ -102,15 +102,24 @@ void sfz::Logger::logCallbackTime(const CallbackBreakdown& breakdown, int numVoi
     if (!loggingEnabled)
         return;
 
-    callbackTimeQueue.try_push<CallbackTime>({ breakdown, numVoices, numSamples });
+    CallbackTime callbackTime;
+    callbackTime.breakdown = breakdown;
+    callbackTime.numVoices = numVoices;
+    callbackTime.numSamples = numSamples;
+    callbackTimeQueue.try_push(callbackTime);
 }
 
 void sfz::Logger::logFileTime(std::chrono::duration<double> waitDuration, std::chrono::duration<double> loadDuration, uint32_t fileSize, absl::string_view filename)
 {
     if (!loggingEnabled)
         return;
 
-    fileTimeQueue.try_push<FileTime>({ waitDuration, loadDuration, fileSize, filename });
+    FileTime fileTime;
+    fileTime.waitDuration = waitDuration;
+    fileTime.loadDuration = loadDuration;
+    fileTime.fileSize = fileSize;
+    fileTime.filename = filename;
+    fileTimeQueue.try_push(fileTime);
 }
 
 void sfz::Logger::setPrefix(absl::string_view prefix)

diff --git a/src/sfizz/Logger.h b/src/sfizz/Logger.h
@@ -48,13 +48,6 @@ 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 };
@@ -76,13 +69,6 @@ struct 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 };

diff --git a/tests/SynthT.cpp b/tests/SynthT.cpp
@@ -515,10 +515,10 @@ TEST_CASE("[Synth] veltrack")
     };
 
     const VeltrackData veltrackdata[] = {
-        { 25, veldata25 },
-        { 50, veldata50 },
-        { 75, veldata75 },
-        { 100, veldata100 },
+        { 25, absl::MakeConstSpan(veldata25) },
+        { 50, absl::MakeConstSpan(veldata50) },
+        { 75, absl::MakeConstSpan(veldata75) },
+        { 100, absl::MakeConstSpan(veldata100) },
     };
 
     for (const VeltrackData& vt : veltrackdata) {