Reviewed-by: Jiewen Yao <jiewen....@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 <gaolim...@byosoft.com.cn>; Liu, Zhiguang > <zhiguang....@intel.com>; Oliver Smith-Denny <o...@linux.microsoft.com>; > Pedro Falcato <pedro.falc...@gmail.com>; Pop, Aaron > <aaron...@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 <gaolim...@byosoft.com.cn> > Cc: Zhiguang Liu <zhiguang....@intel.com> > Cc: Oliver Smith-Denny <o...@linux.microsoft.com> > Cc: Pedro Falcato <pedro.falc...@gmail.com> > Cc: Aaron Pop <aaron...@microsoft.com> > Signed-off-by: Michael D Kinney <michael.d.kin...@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/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
