From dcefd112056b8e7ce7b399f18652d026aef5a559 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Thu, 3 Mar 2022 13:10:34 +0100 Subject: Fixed "taking address of constant" compile error --- zencore/compactbinary.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zencore/compactbinary.cpp') diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 902ec26c8..30b0a4dcb 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -1799,7 +1799,7 @@ TEST_CASE("uson") 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); @@ -1818,7 +1818,7 @@ TEST_CASE("uson") 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); } -- cgit v1.2.3 From edcdc0d9bf7b7deb54df3064a2b46fffaf3d8f9f Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Wed, 9 Mar 2022 11:05:06 +0100 Subject: Remove constexpr in NoneBytes declaration in tests Visual Studio 17.1.1 has a regression causing compilation errors --- zencore/compactbinary.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zencore/compactbinary.cpp') diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 30b0a4dcb..86c9f26da 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,7 +1792,7 @@ 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); @@ -1811,7 +1811,7 @@ TEST_CASE("uson") SUBCASE("CbField(None|EmptyName)") { constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; - constexpr const uint8_t NoneBytes[] = {uint8_t(FieldType), 0}; + const uint8_t NoneBytes[] = {uint8_t(FieldType), 0}; CbFieldView NoneField(NoneBytes + 1, FieldType); CHECK(NoneField.GetSize() == sizeof NoneBytes); CHECK(NoneField.GetName().empty() == true); -- cgit v1.2.3 From 48708ac6bd71ba990d36370a6dfbd2e92197bf6a Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Wed, 9 Mar 2022 11:05:23 +0100 Subject: clang format --- zencore/compactbinary.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'zencore/compactbinary.cpp') diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 86c9f26da..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; - 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; - const char NoneBytes[] = {char(FieldType)}; + const char NoneBytes[] = {char(FieldType)}; CbFieldView NoneField(NoneBytes); CHECK(NoneField.GetSize() == sizeof NoneBytes); @@ -1792,7 +1792,7 @@ TEST_CASE("uson") SUBCASE("CbField(None|Name)") { constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; - 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); @@ -1810,9 +1810,9 @@ TEST_CASE("uson") SUBCASE("CbField(None|EmptyName)") { - constexpr CbFieldType FieldType = CbFieldType::None | CbFieldType::HasFieldName; - 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); -- cgit v1.2.3