summaryrefslogtreecommitdiff
path: root/zen/file_io.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <shieldwed@outlook.com>2019-01-16 00:44:17 +0000
committerDaniel Wilhelm <shieldwed@outlook.com>2019-01-16 00:44:17 +0000
commitc03ea582bff36fe020af1aa329b34f3e6d580f92 (patch)
tree41b8a3085df4de883f2993773b138f1436e041a4 /zen/file_io.cpp
parentMerge branch '10.7' into 'master' (diff)
parent10.8 (diff)
downloadFreeFileSync-c03ea582bff36fe020af1aa329b34f3e6d580f92.tar.gz
FreeFileSync-c03ea582bff36fe020af1aa329b34f3e6d580f92.tar.bz2
FreeFileSync-c03ea582bff36fe020af1aa329b34f3e6d580f92.zip
Merge branch '10.8' into 'master'10.8
10.8 See merge request opensource-tracking/FreeFileSync!5
Diffstat (limited to 'zen/file_io.cpp')
-rwxr-xr-xzen/file_io.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/file_io.cpp b/zen/file_io.cpp
index 80fb3153..1c6ab6f2 100755
--- a/zen/file_io.cpp
+++ b/zen/file_io.cpp
@@ -128,7 +128,7 @@ size_t FileInput::tryRead(void* buffer, size_t bytesToRead) //throw FileError, E
return bytesRead; //"zero indicates end of file"
}
-
+
size_t FileInput::read(void* buffer, size_t bytesToRead) //throw FileError, ErrorFileLocked, X; return "bytesToRead" bytes unless end of stream!
{
/*
@@ -203,7 +203,7 @@ FileOutput::FileOutput(FileHandle handle, const Zstring& filePath, const IOCallb
FileBase(handle, filePath), notifyUnbufferedIO_(notifyUnbufferedIO) {}
-FileOutput::FileOutput(const Zstring& filePath, AccessFlag access, const IOCallback& notifyUnbufferedIO) :
+FileOutput::FileOutput(AccessFlag access, const Zstring& filePath, const IOCallback& notifyUnbufferedIO) :
FileBase(openHandleForWrite(filePath, access), filePath), notifyUnbufferedIO_(notifyUnbufferedIO) {} //throw FileError, ErrorTargetExisting
bgstack15