diff options
author | B Stack <bgstack15@gmail.com> | 2019-03-12 16:09:20 -0400 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2019-03-12 16:09:20 -0400 |
commit | 27177c9cbc47d4114ccee56015fb0407e7e258cc (patch) | |
tree | dc226d83311470a23cdf0c02064feb525fcc5096 /zen/file_io.h | |
parent | Merge branch '10.9' into 'master' (diff) | |
download | FreeFileSync-27177c9cbc47d4114ccee56015fb0407e7e258cc.tar.gz FreeFileSync-27177c9cbc47d4114ccee56015fb0407e7e258cc.tar.bz2 FreeFileSync-27177c9cbc47d4114ccee56015fb0407e7e258cc.zip |
10.10
Diffstat (limited to 'zen/file_io.h')
-rw-r--r-- | zen/file_io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/file_io.h b/zen/file_io.h index bf23d22c..cf5ecc73 100644 --- a/zen/file_io.h +++ b/zen/file_io.h @@ -41,13 +41,13 @@ protected: ~FileBase(); void close(); //throw FileError -> optional, but good place to catch errors when closing stream! - static const FileHandle invalidHandleValue; + static const FileHandle invalidHandleValue_; private: FileBase (const FileBase&) = delete; FileBase& operator=(const FileBase&) = delete; - FileHandle fileHandle_ = invalidHandleValue; + FileHandle fileHandle_ = invalidHandleValue_; const Zstring filePath_; }; @@ -108,7 +108,7 @@ template <class BinContainer> inline BinContainer loadBinContainer(const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, X { FileInput streamIn(filePath, notifyUnbufferedIO); //throw FileError, ErrorFileLocked - return bufferedLoad<BinContainer>(streamIn); //throw FileError, X; + return bufferedLoad<BinContainer>(streamIn); //throw FileError, X } |