mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 13:18:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into wii-network

Browse source 
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
This commit is contained in:
Matthew Parlane 2013-02-23 17:02:58 +13:00
commit c30b8c9eae
136 changed files with 1076 additions and 1371 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/Common/Src/FileUtil.h
View file

@ -151,7 +151,7 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str);
// simple wrapper for cstdlib file functions to
// hopefully will make error checking easier
// and make forgetting an fclose() harder
class IOFile : NonCopyable
class IOFile
{
public:
IOFile();
@ -159,6 +159,11 @@ public:
IOFile(const std::string& filename, const char openmode[]);
~IOFile();
IOFile(IOFile&& other);
IOFile& operator=(IOFile&& other);
void Swap(IOFile& other);
bool Open(const std::string& filename, const char openmode[]);
bool Close();
@ -213,6 +218,7 @@ public:
void Clear() { m_good = true; std::clearerr(m_file); }
private:
IOFile(const IOFile&) /*= delete*/;
IOFile& operator=(const IOFile&) /*= delete*/;
std::FILE* m_file;