From 6b7b36a8745ddfd0e24fa51ef74dbc3058b3dacc Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 12 Sep 2014 00:17:15 +0200 Subject: Common: Rename the File namespace to FileUtil, to match the filename and prevent collisions. --- src/common/chunk_file.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/common/chunk_file.h') diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 2b0f120e..7a3b537c 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -671,7 +671,7 @@ public: _failureReason->clear(); _failureReason->append("LoadStateWrongVersion"); - if (!File::Exists(_rFilename)) { + if (!FileUtil::Exists(_rFilename)) { _failureReason->clear(); _failureReason->append("LoadStateDoesntExist"); ERROR_LOG(COMMON, "ChunkReader: File doesn't exist"); @@ -679,7 +679,7 @@ public: } // Check file size - const u64 fileSize = File::GetSize(_rFilename); + const u64 fileSize = FileUtil::GetSize(_rFilename); static const u64 headerSize = sizeof(SChunkHeader); if (fileSize < headerSize) { @@ -687,7 +687,7 @@ public: return ERROR_BAD_FILE; } - File::IOFile pFile(_rFilename, "rb"); + FileUtil::IOFile pFile(_rFilename, "rb"); if (!pFile) { ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading"); @@ -765,7 +765,7 @@ public: { INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str()); - File::IOFile pFile(_rFilename, "wb"); + FileUtil::IOFile pFile(_rFilename, "wb"); if (!pFile) { ERROR_LOG(COMMON,"ChunkReader: Error opening file for write"); -- cgit v1.2.3