From a19b477c8e6b41c3c457b70dfdb95f38b4721aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 2 Jan 2017 22:59:51 +0100 Subject: [PATCH] Fix compilation with ICC --- src/core/Zip.cpp | 2 +- src/core/Zip.h | 2 +- src/title/TitleSequenceManager.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/Zip.cpp b/src/core/Zip.cpp index 7ce770e518..9dad0b72a4 100644 --- a/src/core/Zip.cpp +++ b/src/core/Zip.cpp @@ -59,7 +59,7 @@ public: return name; } - const uint64 GetFileSize(size_t index) const override + uint64 GetFileSize(size_t index) const override { zip_stat_t zipFileStat; if (zip_stat_index(_zip, index, 0, &zipFileStat) == ZIP_ER_OK) diff --git a/src/core/Zip.h b/src/core/Zip.h index 88a24698d3..8e3c8798ca 100644 --- a/src/core/Zip.h +++ b/src/core/Zip.h @@ -27,7 +27,7 @@ interface IZipArchive virtual size_t GetNumFiles() const abstract; virtual const utf8 * GetFileName(size_t index) const abstract; - virtual const uint64 GetFileSize(size_t index) const abstract; + virtual uint64 GetFileSize(size_t index) const abstract; virtual void * GetFileData(const utf8 * path, size_t * outSize) const abstract; /** diff --git a/src/title/TitleSequenceManager.cpp b/src/title/TitleSequenceManager.cpp index ba95b04cad..1a01354dc6 100644 --- a/src/title/TitleSequenceManager.cpp +++ b/src/title/TitleSequenceManager.cpp @@ -170,7 +170,7 @@ namespace TitleSequenceManager return std::string(path); } - static const uint16 GetPredefinedIndex(const std::string &path) + static uint16 GetPredefinedIndex(const std::string &path) { const utf8 * filename = Path::GetFileName(path.c_str()); for (uint16 i = 0; i < Util::CountOf(PredefinedSequences); i++)