From 01c262fe47c4ecf5c27950b13be2a833af851085 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 5 Aug 2017 12:28:24 -0400 Subject: [PATCH] Filesystem: Declare FileInfo iterator's move constructor and assignment operator noexcept Prevents potential extra copies being created in the context of std::move_if_noexcept. --- Source/Core/DiscIO/Filesystem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h index a5695958b7..abfb19778c 100644 --- a/Source/Core/DiscIO/Filesystem.h +++ b/Source/Core/DiscIO/Filesystem.h @@ -33,14 +33,14 @@ public: const_iterator() : m_file_info(nullptr) {} const_iterator(std::unique_ptr file_info) : m_file_info(std::move(file_info)) {} const_iterator(const const_iterator& it) : m_file_info(it.m_file_info->clone()) {} - const_iterator(const_iterator&& it) : m_file_info(std::move(it.m_file_info)) {} + const_iterator(const_iterator&& it) noexcept : m_file_info(std::move(it.m_file_info)) {} ~const_iterator() = default; const_iterator& operator=(const const_iterator& it) { m_file_info = it.m_file_info ? it.m_file_info->clone() : nullptr; return *this; } - const_iterator& operator=(const_iterator&& it) + const_iterator& operator=(const_iterator&& it) noexcept { m_file_info = std::move(it.m_file_info); return *this;