[v2] Address C++ keyword collisions

[edk2-devel] [Patch v2 0/3] Address C++ keyword collisions

Posted by Michael D Kinney 11 months, 1 week ago

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(-)

-- 
2.40.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105465): https://edk2.groups.io/g/devel/message/105465
Mute This Topic: https://groups.io/mt/99226542/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions

Posted by Oliver Smith-Denny 11 months, 1 week ago

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(-)
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105509): https://edk2.groups.io/g/devel/message/105509
Mute This Topic: https://groups.io/mt/99226542/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

回复: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions

Posted by gaoliming via groups.io 11 months, 1 week ago

For the patch set, Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Oliver
> Smith-Denny
> 发送时间: 2023年6月1日 1:46
> 收件人: Michael D Kinney <michael.d.kinney@intel.com>;
> devel@edk2.groups.io
> 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Zhiguang Liu
> <zhiguang.liu@intel.com>; Pedro Falcato <pedro.falcato@gmail.com>; Aaron
> Pop <aaronpop@microsoft.com>
> 主题: Re: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions
> 
> 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(-)
> >
> 
> 
> 
> 






-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105531): https://edk2.groups.io/g/devel/message/105531
Mute This Topic: https://groups.io/mt/99259316/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions

Posted by Yao, Jiewen 11 months, 1 week ago

Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

Hi Mike
Do you think if we can enhance CI to catch such keyword?
I don't mean to need it in this patch, but something we could consider later.

Thank you
Yao, Jiewen


> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael D
> Kinney
> Sent: Wednesday, May 31, 2023 2:53 AM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <gaoliming@byosoft.com.cn>; Liu, Zhiguang
> <zhiguang.liu@intel.com>; Oliver Smith-Denny <osde@linux.microsoft.com>;
> Pedro Falcato <pedro.falcato@gmail.com>; Pop, Aaron
> <aaronpop@microsoft.com>
> Subject: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions
> 
> 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(-)
> 
> --
> 2.40.1.windows.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105471): https://edk2.groups.io/g/devel/message/105471
Mute This Topic: https://groups.io/mt/99226542/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-