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.847.1685555180789045839
 for <devel@edk2.groups.io>;
 Wed, 31 May 2023 10:46:20 -0700
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@linux.microsoft.com header.s=default header.b=IbCQpphq;
 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 4C52420FC453;
	Wed, 31 May 2023 10:46:20 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4C52420FC453
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
	s=default; t=1685555180;
	bh=DvJfb+7AGDSM3wVTV8kgdlfO+a3Bg/9oTyomjuO+w8Q=;
	h=Date:Subject:To:Cc:References:From:In-Reply-To:From;
	b=IbCQpphqGDERfvLP+F6MEssAeIhxhFuK39kESRtFIq52bkc3EkIHCg7xbHI08Z33C
	 12AAfqKsabByrTA6hsP+2I1BJLWgSOTFYr4I9DttMpP44qdNV7SBkFfoFiWjvZVKuA
	 S2lTAdC6IfrNSynp/Ld+1ATqiPQioT105FFcFOxo=
Message-ID: <1a9fac1d-6d31-a836-77dd-114ec520321d@linux.microsoft.com>
Date: Wed, 31 May 2023 10:46:20 -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: [Patch v2 0/3] Address C++ keyword collisions
To: Michael D Kinney <michael.d.kinney@intel.com>, devel@edk2.groups.io
Cc: Liming Gao <gaoliming@byosoft.com.cn>,
 Zhiguang Liu <zhiguang.liu@intel.com>,
 Pedro Falcato <pedro.falcato@gmail.com>, Aaron Pop <aaronpop@microsoft.com>
References: <20230530185322.70-1-michael.d.kinney@intel.com>
From: "Oliver Smith-Denny" <osde@linux.microsoft.com>
In-Reply-To: <20230530185322.70-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 <osde@linux.microsoft.com>

Thanks!

On 5/30/2023 11:53 AM, Michael D Kinney wrote:
> New in v2
> ==========
> Changes from 2 patches to 3 patches to support bisect.  This
> temporarily uses an anonymous union to allow use of both field
> name styles.  It also allows downstream usage of these fields
> to sync with the first 2 patches, update their field names,
> and then sync with last patch.
> 
> PR: https://github.com/tianocore/edk2/pull/4436
> 
> ===========
> 
> 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 <gaoliming@byosoft.com.cn>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> Cc: Oliver Smith-Denny <osde@linux.microsoft.com>
> Cc: Pedro Falcato <pedro.falcato@gmail.com>
> Cc: Aaron Pop <aaronpop@microsoft.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael D Kinney (3):
>    MdePkg/Include/IndustryStandard: Add Operator and Xor field names
>    SecurityPkg/Library/TpmCommandLib: Change xor to Xor
>    MdePkg/Include/IndustryStandard: Address C++ keyword collisions
> 
>   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(-)
>