diff options
| author | B Stack <bgstack15@gmail.com> | 2021-02-02 11:44:31 -0500 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-02-02 11:44:31 -0500 |
| commit | d299ddd2f27a437f0fc0cb49abdfd6dd8e3d94f8 (patch) | |
| tree | 4d7c950512836f473a6a8cbb521c61e800db6584 /FreeFileSync/Source/afs/native.cpp | |
| parent | Merge branch '11.5' into 'master' (diff) | |
| download | FreeFileSync-d299ddd2f27a437f0fc0cb49abdfd6dd8e3d94f8.tar.gz FreeFileSync-d299ddd2f27a437f0fc0cb49abdfd6dd8e3d94f8.tar.bz2 FreeFileSync-d299ddd2f27a437f0fc0cb49abdfd6dd8e3d94f8.zip | |
add upstream 11.6
Diffstat (limited to 'FreeFileSync/Source/afs/native.cpp')
| -rw-r--r-- | FreeFileSync/Source/afs/native.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/FreeFileSync/Source/afs/native.cpp b/FreeFileSync/Source/afs/native.cpp index 1f8b33f6..2e078378 100644 --- a/FreeFileSync/Source/afs/native.cpp +++ b/FreeFileSync/Source/afs/native.cpp @@ -10,12 +10,12 @@ #include <zen/file_io.h> #include <zen/file_id_def.h> #include <zen/stl_tools.h> +#include <zen/resolve_path.h> #include <zen/recycler.h> #include <zen/thread.h> #include <zen/guid.h> #include <zen/crc.h> #include "abstract_impl.h" -#include "../base/resolve_path.h" #include "../base/icon_loader.h" @@ -43,9 +43,8 @@ AFS::FileId convertToAbstractFileId(const zen::FileId& fid) if (fid == zen::FileId()) return AFS::FileId(); - AFS::FileId out(reinterpret_cast<const char*>(&fid.volumeId), sizeof(fid.volumeId)); - out. append(reinterpret_cast<const char*>(&fid.fileIndex), sizeof(fid.fileIndex)); - return out; + AFS::FileId out(reinterpret_cast<const char*>(&fid.volumeId), sizeof(fid.volumeId)); + return out.append(reinterpret_cast<const char*>(&fid.fileIndex), sizeof(fid.fileIndex)); } |