diff options
| author | 2014-12-07 13:40:04 -0500 | |
|---|---|---|
| committer | 2014-12-07 13:40:04 -0500 | |
| commit | 2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch) | |
| tree | 4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/file_util.h | |
| parent | Merge pull request #252 from yuriks/patch-1 (diff) | |
| parent | Change NULLs to nullptrs. (diff) | |
| download | yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.gz yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.xz yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.zip | |
Merge pull request #245 from rohit-n/null-nullptr
Change NULLs to nullptrs.
Diffstat (limited to 'src/common/file_util.h')
| -rw-r--r-- | src/common/file_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h index 72b80be8a..beaf7174a 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h | |||
| @@ -202,11 +202,11 @@ public: | |||
| 202 | return WriteArray(reinterpret_cast<const char*>(data), length); | 202 | return WriteArray(reinterpret_cast<const char*>(data), length); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | bool IsOpen() { return NULL != m_file; } | 205 | bool IsOpen() { return nullptr != m_file; } |
| 206 | 206 | ||
| 207 | // m_good is set to false when a read, write or other function fails | 207 | // m_good is set to false when a read, write or other function fails |
| 208 | bool IsGood() { return m_good; } | 208 | bool IsGood() { return m_good; } |
| 209 | operator void*() { return m_good ? m_file : NULL; } | 209 | operator void*() { return m_good ? m_file : nullptr; } |
| 210 | 210 | ||
| 211 | std::FILE* ReleaseHandle(); | 211 | std::FILE* ReleaseHandle(); |
| 212 | 212 | ||