From 497cf8e5c413af2444b569172d6cfb6dd466d743 Mon Sep 17 00:00:00 2001 From: kappa44 <6469032-kappa44@users.noreply.gitlab.com> Date: Sun, 16 May 2021 13:57:44 +1000 Subject: [PATCH] Fix compile errors on Centos 7 --- oscar/SleepLib/loader_plugins/intellipap_loader.cpp | 2 +- oscar/miniz.c | 3 ++- oscar/statistics.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp index 74e72a92..2263c974 100644 --- a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp @@ -2426,7 +2426,7 @@ bool backup6 (const QString & path) { QStringList fileNames = hpath.entryList(); // Get list of files if (! fileNames.isEmpty()) { QString lastFile = fileNames.first(); - qDebug() << "last settings file is" << lastFile << "new file is" << settingsFile; + qDebug() << "last settings file is" << lastFile << "new file is" << settingsFile.fileName(); QByteArray newMD5 = fileChecksum(settingsFile.fileName(), QCryptographicHash::Md5); QByteArray oldMD5 = fileChecksum(hpath.absolutePath()+"/"+lastFile, QCryptographicHash::Md5); if (newMD5 == oldMD5) diff --git a/oscar/miniz.c b/oscar/miniz.c index 9ded4c75..0b2bd175 100644 --- a/oscar/miniz.c +++ b/oscar/miniz.c @@ -5329,7 +5329,8 @@ mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint f goto handle_failure; } - has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID); + pSrc = descriptor_buf; // avoid g++ warning/error + has_id = (MZ_READ_LE32(pSrc) == MZ_ZIP_DATA_DESCRIPTOR_ID); pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf; file_crc32 = MZ_READ_LE32(pSrc); diff --git a/oscar/statistics.h b/oscar/statistics.h index 0c3946da..c64ee1e2 100644 --- a/oscar/statistics.h +++ b/oscar/statistics.h @@ -128,7 +128,7 @@ public: dates = copy.dates; highlight = copy.highlight; } - RXItem& operator=(const RXItem& other) = default; + RXItem& operator=(const RXItem&) = default; inline quint64 count(ChannelID id) const { QHash::const_iterator it = s_count.find(id); if (it == s_count.end()) return 0;