diff options
| author | Dan Engelbrecht <[email protected]> | 2022-05-02 16:30:46 +0200 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2022-05-02 16:30:46 +0200 |
| commit | 92cfc05c04633ce98b2c417c31c4a21f397a90fd (patch) | |
| tree | c56640460a20b0e24f499f5e9d5c8fbfa094ce1e /zenserver/cache/structuredcachestore.cpp | |
| parent | Don't use "GC" term in block store (diff) | |
| parent | removed redundant pragma pack (diff) | |
| download | zen-92cfc05c04633ce98b2c417c31c4a21f397a90fd.tar.xz zen-92cfc05c04633ce98b2c417c31c4a21f397a90fd.zip | |
Merge branch 'de/block-store-refactor' of github.com:EpicGames/zen into de/block-store-refactor
Diffstat (limited to 'zenserver/cache/structuredcachestore.cpp')
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 6311fc2c5..015912ce9 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -39,9 +39,6 @@ ZEN_THIRD_PARTY_INCLUDES_END ////////////////////////////////////////////////////////////////////////// -#pragma pack(push) -#pragma pack(1) - namespace zen { namespace { @@ -863,7 +860,7 @@ ZenCacheDiskLayer::CacheBucket::MigrateLegacyData(bool CleanSource) { BasicFile BlockFile; BlockFile.Open(LegacyDataPath, CleanSource ? BasicFile::Mode::kWrite : BasicFile::Mode::kRead); - BlockFileSize = BlockFile.FileSize(); + BlockFileSize = BlockFile.FileSize();strcut } std::unordered_map<IoHash, LegacyDiskIndexEntry, IoHash::Hasher> LegacyDiskIndex; |