From 045a8400e6ddb854a79eaaa499d09d54345d3dc3 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 4 Jan 2017 18:15:53 -0500
Subject: [PATCH] IOFile: Make the move constructor and move assignment
 operator noexcept

Certain parts of the standard library try to determine whether or not a
transfer operation should either be a copy or a move. The prevalent notion
of move constructors/assignment operators is that they should not throw,
they simply move an already existing resource somewhere else.

This is typically done with 'std::move_if_noexcept'. Like the name says,
if a type's move constructor is noexcept, then the functions retrieves an
r-value reference (for move semantics), or an l-value (for copy semantics)
if it is not noexcept.

As IOFile deletes the copy constructor and copy assignment operators,
using IOFile with certain parts of the standard library can fail in
unexcepted ways (especially when used with various container
implementations). This prevents that.
---
 Source/Core/Common/FileUtil.cpp | 6 +++---
 Source/Core/Common/FileUtil.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 1fae3418f5..4094f5edcf 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -908,18 +908,18 @@ IOFile::~IOFile()
   Close();
 }
 
-IOFile::IOFile(IOFile&& other) : m_file(nullptr), m_good(true)
+IOFile::IOFile(IOFile&& other) noexcept : m_file(nullptr), m_good(true)
 {
   Swap(other);
 }
 
-IOFile& IOFile::operator=(IOFile&& other)
+IOFile& IOFile::operator=(IOFile&& other) noexcept
 {
   Swap(other);
   return *this;
 }
 
-void IOFile::Swap(IOFile& other)
+void IOFile::Swap(IOFile& other) noexcept
 {
   std::swap(m_file, other.m_file);
   std::swap(m_good, other.m_good);
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index 445c7fc0f4..ef012ad4ff 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -168,10 +168,10 @@ public:
 
   ~IOFile();
 
-  IOFile(IOFile&& other);
-  IOFile& operator=(IOFile&& other);
+  IOFile(IOFile&& other) noexcept;
+  IOFile& operator=(IOFile&& other) noexcept;
 
-  void Swap(IOFile& other);
+  void Swap(IOFile& other) noexcept;
 
   bool Open(const std::string& filename, const char openmode[]);
   bool Close();