diff options
| author | Per Larsson <[email protected]> | 2022-03-19 10:41:08 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-03-19 10:41:08 +0100 |
| commit | 703c252710cdae35a35be700fade144e994777c0 (patch) | |
| tree | 03268a46ea32553c4777ee30cc617f140665938a /zencore/compactbinary.cpp | |
| parent | Minor cleanup. (diff) | |
| parent | Suppress C4305 in third party includes (diff) | |
| download | zen-703c252710cdae35a35be700fade144e994777c0.tar.xz zen-703c252710cdae35a35be700fade144e994777c0.zip | |
Merge branch 'main' into streamapi
Diffstat (limited to 'zencore/compactbinary.cpp')
| -rw-r--r-- | zencore/compactbinary.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 902ec26c8..7cc6db68a 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -1754,7 +1754,7 @@ TEST_CASE("uson") SUBCASE("CbField(None|Type|Name)") { constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; - constexpr const char NoneBytes[] = {char(FieldType), 4, 'N', 'a', 'm', 'e'}; + const char NoneBytes[] = {char(FieldType), 4, 'N', 'a', 'm', 'e'}; CbFieldView NoneField(NoneBytes); CHECK(NoneField.GetSize() == sizeof(NoneBytes)); @@ -1775,7 +1775,7 @@ TEST_CASE("uson") SUBCASE("CbField(None|Type)") { constexpr CbFieldType FieldType = CbFieldType::None; - constexpr const char NoneBytes[] = {char(FieldType)}; + const char NoneBytes[] = {char(FieldType)}; CbFieldView NoneField(NoneBytes); CHECK(NoneField.GetSize() == sizeof NoneBytes); @@ -1792,14 +1792,14 @@ TEST_CASE("uson") SUBCASE("CbField(None|Name)") { constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; - constexpr const char NoneBytes[] = {char(FieldType), 4, 'N', 'a', 'm', 'e'}; + const char NoneBytes[] = {char(FieldType), 4, 'N', 'a', 'm', 'e'}; CbFieldView NoneField(NoneBytes + 1, FieldType); CHECK(NoneField.GetSize() == uint64_t(sizeof NoneBytes)); CHECK(NoneField.GetName().compare("Name") == 0); CHECK(NoneField.HasName() == true); CHECK(NoneField.HasValue() == false); CHECK(NoneField.GetHash() == IoHash::HashBuffer(NoneBytes, sizeof NoneBytes)); - CHECK(NoneField.GetView() == MemoryView(&NoneBytes[1], sizeof NoneBytes - 1)); + CHECK(NoneField.GetView() == MemoryView(NoneBytes + 1, sizeof NoneBytes - 1)); MemoryView SerializedView; CHECK(NoneField.TryGetSerializedView(SerializedView) == false); @@ -1810,15 +1810,15 @@ TEST_CASE("uson") SUBCASE("CbField(None|EmptyName)") { - constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; - constexpr const uint8_t NoneBytes[] = {uint8_t(FieldType), 0}; - CbFieldView NoneField(NoneBytes + 1, FieldType); + constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; + const uint8_t NoneBytes[] = {uint8_t(FieldType), 0}; + CbFieldView NoneField(NoneBytes + 1, FieldType); CHECK(NoneField.GetSize() == sizeof NoneBytes); CHECK(NoneField.GetName().empty() == true); CHECK(NoneField.HasName() == true); CHECK(NoneField.HasValue() == false); CHECK(NoneField.GetHash() == IoHash::HashBuffer(NoneBytes, sizeof NoneBytes)); - CHECK(NoneField.GetView() == MemoryView(&NoneBytes[1], sizeof NoneBytes - 1)); + CHECK(NoneField.GetView() == MemoryView(NoneBytes + 1, sizeof NoneBytes - 1)); MemoryView SerializedView; CHECK(NoneField.TryGetSerializedView(SerializedView) == false); } |