diff options
| author | Martin Ridgers <[email protected]> | 2022-02-11 10:35:56 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2022-02-11 10:35:56 +0100 |
| commit | da29a7c50b0bcf540090bc923bfda47522d8ae27 (patch) | |
| tree | 3f44ab24a3319212cd7e17b05396282d0e1b628a /zenserver-test/zenserver-test.cpp | |
| parent | Do not zombify child processes to more closely match Windows (diff) | |
| download | zen-da29a7c50b0bcf540090bc923bfda47522d8ae27.tar.xz zen-da29a7c50b0bcf540090bc923bfda47522d8ae27.zip | |
Fixed "UserData* UserData" non-conformancy errors from GCC
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index a9e096dac..64458dde4 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -1783,26 +1783,26 @@ TEST_CASE("zcache.rpc.allpolicies") CbObject Record; CacheRecordPolicy Policy; KeyData* Values; - UserData* UserData; + UserData* Data; }; struct CachePutValueRequest { CacheKey Key; CompressedBuffer Value; CachePolicy Policy; - UserData* UserData; + UserData* Data; }; struct CacheGetRequest { CacheKey Key; CacheRecordPolicy Policy; - UserData* UserData; + UserData* Data; }; struct CacheGetValueRequest { CacheKey Key; CachePolicy Policy; - UserData* UserData; + UserData* Data; }; struct CacheGetChunkRequest { @@ -1812,7 +1812,7 @@ TEST_CASE("zcache.rpc.allpolicies") uint64_t RawSize; IoHash RawHash; CachePolicy Policy; - UserData* UserData; + UserData* Data; }; KeyData KeyDatas[NumKeys]; @@ -1961,7 +1961,7 @@ TEST_CASE("zcache.rpc.allpolicies") Request.Policy.Save(Writer); } Writer.EndObject(); - Request.UserData->KeyData->ReceivedPut = true; + Request.Data->KeyData->ReceivedPut = true; } Writer.EndArray(); } @@ -2000,7 +2000,7 @@ TEST_CASE("zcache.rpc.allpolicies") Writer.AddString("Policy"sv, WriteToString<128>(Request.Policy)); } Writer.EndObject(); - Request.UserData->KeyData->ReceivedPutValue = true; + Request.Data->KeyData->ReceivedPutValue = true; } Writer.EndArray(); } @@ -2075,7 +2075,7 @@ TEST_CASE("zcache.rpc.allpolicies") bool Succeeded = !ResponseField.HasError(); CacheGetRequest& Request = GetRequests[Index++]; - KeyData* KeyData = Request.UserData->KeyData; + KeyData* KeyData = Request.Data->KeyData; KeyData->ReceivedGet = true; if (KeyData->ShouldBeHit) @@ -2181,7 +2181,7 @@ TEST_CASE("zcache.rpc.allpolicies") bool Succeeded = !RawHashField.HasError(); CacheGetValueRequest& Request = GetValueRequests[Index++]; - KeyData* KeyData = Request.UserData->KeyData; + KeyData* KeyData = Request.Data->KeyData; KeyData->ReceivedGetValue = true; if (KeyData->ShouldBeHit) @@ -2244,7 +2244,7 @@ TEST_CASE("zcache.rpc.allpolicies") Writer << "Bucket"sv << Request.Key.Bucket << "Hash"sv << Request.Key.Hash; } Writer.EndObject(); - Writer.AddObjectId("ValueId"sv, ValueIds[Request.UserData->ValueIndex]); + Writer.AddObjectId("ValueId"sv, ValueIds[Request.Data->ValueIndex]); Writer.AddInteger("RawOffset"sv, Request.RawOffset); Writer.AddInteger("RawSize"sv, Request.RawSize); Writer.AddHash("ChunkId"sv, IoHash()); @@ -2276,8 +2276,8 @@ TEST_CASE("zcache.rpc.allpolicies") bool Succeeded = !RawHashField.HasError(); CacheGetChunkRequest& Request = ChunkRequests[Index++]; - KeyData* KeyData = Request.UserData->KeyData; - int ValueIndex = Request.UserData->ValueIndex >= 0 ? Request.UserData->ValueIndex : 0; + KeyData* KeyData = Request.Data->KeyData; + int ValueIndex = Request.Data->ValueIndex >= 0 ? Request.Data->ValueIndex : 0; KeyData->ReceivedChunk[ValueIndex] = true; if (KeyData->ShouldBeHit) |