Re: [Patch 0/2] Address C++ keyword collisions

["Michael D Kinney" <michael.d.kinney@intel.com>]

Hi Pedro,

Great point on bisect.  It is also important to provide patches
that allow downstream usage of these fields to be able to
use a subset of the patches that support both field names
so they can update and test their code before using the full
patch series that removes the old field name.

I have sent V2 of this series that temporarily uses an
anonymous union to support old and new field names.

Mike

> -----Original Message-----
> From: Pedro Falcato <pedro.falcato@gmail.com>
> Sent: Tuesday, May 30, 2023 5:10 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>; Liu,
> Zhiguang <zhiguang.liu@intel.com>; Oliver Smith-Denny
> <osde@linux.microsoft.com>; Pop, Aaron <aaronpop@microsoft.com>
> Subject: Re: [Patch 0/2] Address C++ keyword collisions
> 
> On Mon, May 29, 2023 at 6:06 PM Michael D Kinney
> <michael.d.kinney@intel.com> 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 <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 (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(-)
> >
> > --
> > 2.40.1.windows.1
> >
> 
> For the series:
> 
> Reviewed-by: Pedro Falcato <pedro.falcato@gmail.com>
> 
> Make sure you squash these two commits into one, as to not break
> bisectability.
> 
> --
> Pedro