octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1660 from MerryMage/file_util 

FileUtil: Missing #include, Add const to IOFile methods
This commit is contained in:
bunnei 2016-04-12 11:58:41 -04:00
parent 38f4c9cce9 226c5546e2
commit db0db6a182
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/file_util.h
View File

@ -14,6 +14,10 @@
#include "common/common_types.h" #include "common/common_types.h"
#ifdef _MSC_VER
#include "common/string_util.h"
#endif
// User directory indices for GetUserPath // User directory indices for GetUserPath
enum { enum {
D_USER_IDX, D_USER_IDX,
@ -172,7 +176,7 @@ class IOFile : public NonCopyable
{ {
public: public:
IOFile(); IOFile();
IOFile(std::FILE* file); explicit IOFile(std::FILE* file);
IOFile(const std::string& filename, const char openmode[]); IOFile(const std::string& filename, const char openmode[]);
~IOFile(); ~IOFile();
@ -235,10 +239,10 @@ public:
return WriteArray(&object, 1); return WriteArray(&object, 1);
} }
bool IsOpen() { return nullptr != m_file; } bool IsOpen() const { return nullptr != m_file; }
// m_good is set to false when a read, write or other function fails // m_good is set to false when a read, write or other function fails
bool IsGood() { return m_good; } bool IsGood() const { return m_good; }
operator void*() { return m_good ? m_file : nullptr; } operator void*() { return m_good ? m_file : nullptr; }
std::FILE* ReleaseHandle(); std::FILE* ReleaseHandle();
@ -258,9 +262,6 @@ public:
std::FILE* m_file; std::FILE* m_file;
bool m_good; bool m_good;
private:
IOFile(IOFile&);
IOFile& operator=(IOFile& other);
}; };
} // namespace } // namespace