From 48883850aac2f3b5c6d7ff1b48789294878c5836 Mon Sep 17 00:00:00 2001 From: "sascha.manier@uni-saarland.de" Date: Tue, 19 Nov 2024 10:59:55 +0100 Subject: [PATCH 1/2] Fix Issue #288: Compilation fails: control reaches end of non-void function --- DESCRIPTION | 1 + src/pwiz/data/msdata/MSData.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index d0c0aaed7..ad1959550 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -9,6 +9,7 @@ Authors@R: c( person("Laurent", "Gatto", email="laurent.gatto@uclouvain.be", role=c("aut")), person("Qiakng", "Kou", email="qkou@umail.iu.edu", role=c("aut")), person("David","Rauh",email="drauh@ipb-halle.de", role=c("ctb")) + person("Sascha","Manier",email="sascha.manier@uni-saarland.de", role=c("ctb")) ) Description: mzR provides a unified API to the common file formats and parsers available for mass spectrometry data. It comes with a diff --git a/src/pwiz/data/msdata/MSData.cpp b/src/pwiz/data/msdata/MSData.cpp index 963bcb655..88c9589f5 100644 --- a/src/pwiz/data/msdata/MSData.cpp +++ b/src/pwiz/data/msdata/MSData.cpp @@ -1112,6 +1112,8 @@ PWIZ_API_DECL size_t SpectrumList::findAbbreviated(const string& abbreviatedId, if ((result >= 0 && result < size()) || s == 0) return result; } + + return size(); } From 24872950179ee83653f6cd911319b9934e05a40f Mon Sep 17 00:00:00 2001 From: "sascha.manier@uni-saarland.de" Date: Tue, 19 Nov 2024 12:51:01 +0100 Subject: [PATCH 2/2] Fixed typo in DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index ad1959550..69bc60d04 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,7 +8,7 @@ Authors@R: c( person("Steffen", "Neumann", email="sneumann@ipb-halle.de", role=c("aut","cre")), person("Laurent", "Gatto", email="laurent.gatto@uclouvain.be", role=c("aut")), person("Qiakng", "Kou", email="qkou@umail.iu.edu", role=c("aut")), - person("David","Rauh",email="drauh@ipb-halle.de", role=c("ctb")) + person("David","Rauh",email="drauh@ipb-halle.de", role=c("ctb")), person("Sascha","Manier",email="sascha.manier@uni-saarland.de", role=c("ctb")) ) Description: mzR provides a unified API to the common file formats and