From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web11.1875.1685463986372618800 for ; Tue, 30 May 2023 09:26:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=fhXFWcMv; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: osde@linux.microsoft.com) Received: from [10.137.194.171] (unknown [131.107.1.171]) by linux.microsoft.com (Postfix) with ESMTPSA id AE66420FC3D0; Tue, 30 May 2023 09:26:25 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com AE66420FC3D0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1685463985; bh=uSQeR+xDlDizPoVC3SFJCEIF4CAncVXjyNlsL5UvXLs=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=fhXFWcMvdGWg+p7i6a6vQIiSHUnc06Ztjp99hKUmisJItZaQvGXdR9xyTyoGZH+6G pWJCtxTgd9bOa2mggh4i9HC7dKV8JoeJZvroxWLC3K+0iiKEnZw5DupECYFlWEHgDJ L1X9wCxJ0Fe2HYffD2Tbpgcetzklr6WCm+C4wksk= Message-ID: Date: Tue, 30 May 2023 09:26:25 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [edk2-devel] [Patch 0/2] Address C++ keyword collisions To: devel@edk2.groups.io, michael.d.kinney@intel.com Cc: Liming Gao , Zhiguang Liu , Pedro Falcato , Aaron Pop References: <20230529170649.1506-1-michael.d.kinney@intel.com> From: "Oliver Smith-Denny" In-Reply-To: <20230529170649.1506-1-michael.d.kinney@intel.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit For the patchset: Reviewed-by: Oliver Smith-Denny Thanks! On 5/29/2023 10:06 AM, Michael D Kinney wrote: > Update Tpm12.h and Tpm20.h and not use c++ reserved keywords > operator and xor in C structures to support use of these > include files when building with a C++ compiler. > > Update SecurityPkg Tpm2CommandLib to use updated field names. > > * Change operator -> Operator > * Change xor -> Xor > > NOTE: This is a non-backwards compatible change to Tpm12.h > and Tmp20.h. And consumers of these include files that access > the "operator" or "xor" fields must be updated. > > Cc: Liming Gao > Cc: Zhiguang Liu > Cc: Oliver Smith-Denny > Cc: Pedro Falcato > Cc: Aaron Pop > Signed-off-by: Michael D Kinney > > Michael D Kinney (2): > MdePkg/Include/IndustryStandard: Address C++ keyword collisions > SecurityPkg/Library/TpmCommandLib: Change xor to Xor > > MdePkg/Include/IndustryStandard/Tpm12.h | 4 ++-- > MdePkg/Include/IndustryStandard/Tpm20.h | 4 ++-- > SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c | 6 +++--- > SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c | 6 +++--- > SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c | 2 +- > 5 files changed, 11 insertions(+), 11 deletions(-) >