aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2022-02-11 10:43:06 +0100
committerMartin Ridgers <[email protected]>2022-02-11 10:43:06 +0100
commitc02d405316a77791e03982fdf02d9049cc9d89b0 (patch)
tree942bc6863442ac1382191e79dca46aa3e21caf93
parentFixed "Record* Record;" non-conformant compile errors from GCC (diff)
downloadzen-c02d405316a77791e03982fdf02d9049cc9d89b0.tar.xz
zen-c02d405316a77791e03982fdf02d9049cc9d89b0.zip
Fixed GCC non-conformant errors regarding "KeyData* KeyData;"
-rw-r--r--zenserver-test/zenserver-test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 64458dde4..8ca16e560 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1749,11 +1749,11 @@ TEST_CASE("zcache.rpc.allpolicies")
{
UserData& Set(KeyData* InKeyData, int InValueIndex)
{
- KeyData = InKeyData;
+ Data = InKeyData;
ValueIndex = InValueIndex;
return *this;
}
- KeyData* KeyData = nullptr;
+ KeyData* Data = nullptr;
int ValueIndex = 0;
};
struct KeyData
@@ -1961,7 +1961,7 @@ TEST_CASE("zcache.rpc.allpolicies")
Request.Policy.Save(Writer);
}
Writer.EndObject();
- Request.Data->KeyData->ReceivedPut = true;
+ Request.Data->Data->ReceivedPut = true;
}
Writer.EndArray();
}
@@ -2000,7 +2000,7 @@ TEST_CASE("zcache.rpc.allpolicies")
Writer.AddString("Policy"sv, WriteToString<128>(Request.Policy));
}
Writer.EndObject();
- Request.Data->KeyData->ReceivedPutValue = true;
+ Request.Data->Data->ReceivedPutValue = true;
}
Writer.EndArray();
}
@@ -2075,7 +2075,7 @@ TEST_CASE("zcache.rpc.allpolicies")
bool Succeeded = !ResponseField.HasError();
CacheGetRequest& Request = GetRequests[Index++];
- KeyData* KeyData = Request.Data->KeyData;
+ KeyData* KeyData = Request.Data->Data;
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.Data->KeyData;
+ KeyData* KeyData = Request.Data->Data;
KeyData->ReceivedGetValue = true;
if (KeyData->ShouldBeHit)
@@ -2276,7 +2276,7 @@ TEST_CASE("zcache.rpc.allpolicies")
bool Succeeded = !RawHashField.HasError();
CacheGetChunkRequest& Request = ChunkRequests[Index++];
- KeyData* KeyData = Request.Data->KeyData;
+ KeyData* KeyData = Request.Data->Data;
int ValueIndex = Request.Data->ValueIndex >= 0 ? Request.Data->ValueIndex : 0;
KeyData->ReceivedChunk[ValueIndex] = true;