diff options
| author | Martin Ridgers <[email protected]> | 2021-11-15 14:27:58 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-15 14:27:58 +0100 |
| commit | 7807a69e018a9df96a739dfdb945c648e029f8fe (patch) | |
| tree | 85f9cc9099004f7fb0b1c794937562c6f378c4af /zenserver/upstream/upstreamcache.h | |
| parent | Merged main (diff) | |
| download | zen-7807a69e018a9df96a739dfdb945c648e029f8fe.tar.xz zen-7807a69e018a9df96a739dfdb945c648e029f8fe.zip | |
GCC does not like CacheKey member being named the same as its type
Diffstat (limited to 'zenserver/upstream/upstreamcache.h')
| -rw-r--r-- | zenserver/upstream/upstreamcache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h index e5c3521b9..4b0c17181 100644 --- a/zenserver/upstream/upstreamcache.h +++ b/zenserver/upstream/upstreamcache.h @@ -24,7 +24,7 @@ struct CloudCacheClientOptions; struct UpstreamCacheRecord { ZenContentType Type = ZenContentType::kBinary; - CacheKey CacheKey; + CacheKey Key; std::vector<IoHash> PayloadIds; }; @@ -82,7 +82,7 @@ struct UpstreamEndpointStats struct CacheRecordGetCompleteParams { - const CacheKey& CacheKey; + const CacheKey& Key; size_t KeyIndex = ~size_t(0); const CbObjectView& Record; const CbPackage& Package; |