From b1ffa740432f9322bf937101bbc3d0fe78876b62 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 14 Sep 2016 19:15:27 -0400 Subject: [PATCH] NANDContentLoader: Make CNANDContentData's Get function return by non-const value const specifiers like this are practically pointless and can inhibit move construction. --- Source/Core/DiscIO/NANDContentLoader.cpp | 2 +- Source/Core/DiscIO/NANDContentLoader.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index 98978d98b0..6d4ec186c1 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -107,7 +107,7 @@ void CNANDContentDataFile::Open() { EnsureOpen(); } -const std::vector CNANDContentDataFile::Get() +std::vector CNANDContentDataFile::Get() { std::vector result; EnsureOpen(); diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h index 71afc4ce39..2961012070 100644 --- a/Source/Core/DiscIO/NANDContentLoader.h +++ b/Source/Core/DiscIO/NANDContentLoader.h @@ -27,7 +27,7 @@ class CNANDContentData public: virtual ~CNANDContentData() = 0; virtual void Open(){}; - virtual const std::vector Get() = 0; + virtual std::vector Get() = 0; virtual bool GetRange(u32 start, u32 size, u8* buffer) = 0; virtual void Close(){}; }; @@ -38,7 +38,7 @@ public: CNANDContentDataFile(const std::string& filename) : m_filename(filename){}; void Open() override; - const std::vector Get() override; + std::vector Get() override; bool GetRange(u32 start, u32 size, u8* buffer) override; void Close() override; @@ -53,7 +53,7 @@ class CNANDContentDataBuffer final : public CNANDContentData public: CNANDContentDataBuffer(const std::vector& buffer) : m_buffer(buffer){}; - const std::vector Get() override { return m_buffer; }; + std::vector Get() override { return m_buffer; }; bool GetRange(u32 start, u32 size, u8* buffer) override; private: