From b73bd572d0147bd190719c3ce18c215cf5e48f11 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 22 Oct 2021 13:42:56 -0400 Subject: [PATCH] Fix build failure due to merge conflict. (#10858) https://github.com/project-chip/connectedhomeip/pull/10821 changed the code we generate for tests and in parallel https://github.com/project-chip/connectedhomeip/pull/10826 added a new test that did not get generated with the new setup. --- zzz_generated/chip-tool/zap-generated/test/Commands.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 0ed8dddccc8b62..629eb847f76b9c 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -17355,7 +17355,7 @@ class TestBasicInformation : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevice, 0); - chip::ByteSpan locationArgument = chip::ByteSpan(chip::Uint8::from_const_char("us"), strlen("us")); + chip::CharSpan locationArgument = chip::CharSpan("us", strlen("us")); return cluster.WriteAttributeLocation(mOnSuccessCallback_1.Cancel(), mOnFailureCallback_1.Cancel(), locationArgument); } @@ -17385,7 +17385,7 @@ class TestBasicInformation : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevice, 0); - chip::ByteSpan locationArgument = chip::ByteSpan(chip::Uint8::from_const_char(""), strlen("")); + chip::CharSpan locationArgument = chip::CharSpan("", strlen("")); return cluster.WriteAttributeLocation(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel(), locationArgument); }