aboutsummaryrefslogtreecommitdiff
path: root/src/zenstore
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-05-15 18:07:45 +0200
committerStefan Boberg <[email protected]>2023-05-15 18:07:45 +0200
commit06aaf561fed3db1eed2a044180895957de87ed20 (patch)
treec80ef0d23b77ea251904c9f05a0626ef6fdc3a78 /src/zenstore
parentimplemented string conversion for CbValidateError enum (diff)
parentRemove ATL header usage (#306) (diff)
downloadzen-06aaf561fed3db1eed2a044180895957de87ed20.tar.xz
zen-06aaf561fed3db1eed2a044180895957de87ed20.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'src/zenstore')
-rw-r--r--src/zenstore/filecas.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/zenstore/filecas.cpp b/src/zenstore/filecas.cpp
index 108d37607..4474b52bd 100644
--- a/src/zenstore/filecas.cpp
+++ b/src/zenstore/filecas.cpp
@@ -33,7 +33,7 @@
ZEN_THIRD_PARTY_INCLUDES_START
#include <xxhash.h>
#if ZEN_PLATFORM_WINDOWS
-# include <atlfile.h>
+# include <zencore/windows.h>
#endif
ZEN_THIRD_PARTY_INCLUDES_END
@@ -301,7 +301,7 @@ FileCasStrategy::InsertChunk(IoBuffer Chunk, const IoHash& ChunkHash, CasStore::
const HANDLE ChunkFileHandle = FileRef.FileHandle;
// See if file already exists
{
- CAtlFile PayloadFile;
+ windows::FileHandle PayloadFile;
if (HRESULT hRes = PayloadFile.Create(Name.ShardedPath.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING); SUCCEEDED(hRes))
{
@@ -386,7 +386,7 @@ FileCasStrategy::InsertChunk(IoBuffer Chunk, const IoHash& ChunkHash, CasStore::
// The rename/move could fail because the target directory does not yet exist. This code attempts
// to create it
- CAtlFile DirHandle;
+ windows::FileHandle DirHandle;
auto InternalCreateDirectoryHandle = [&] {
return DirHandle.Create(FilePath.c_str(),
@@ -551,7 +551,7 @@ FileCasStrategy::InsertChunk(const void* const ChunkData, const size_t ChunkSize
// See if file already exists
#if ZEN_PLATFORM_WINDOWS
- CAtlFile PayloadFile;
+ windows::FileHandle PayloadFile;
HRESULT hRes = PayloadFile.Create(Name.ShardedPath.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING);