From 55b0ec2ffbe7601a11d430d66dd94b12f026bfd9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 22 Jun 2024 18:34:32 -0700 Subject: [PATCH] fix clang-cl compilation Fixes: error: invalid bitwise operation between different enumeration types Signed-off-by: Rosen Penev (cherry picked from commit 84eefdae2e4fcb588a322b91fd732e825e788ea6) --- xmpsdk/src/ParseRDF.cpp | 2 +- xmpsdk/src/XMPCore_Impl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmpsdk/src/ParseRDF.cpp b/xmpsdk/src/ParseRDF.cpp index c47ffd73db..a92257c204 100644 --- a/xmpsdk/src/ParseRDF.cpp +++ b/xmpsdk/src/ParseRDF.cpp @@ -590,7 +590,7 @@ FixupQualifiedNode ( XMP_Node * xmpParent ) // value node's children to be the parent's children. Delete the now useless value node. XMP_Assert ( xmpParent->options & (kXMP_PropValueIsStruct | kRDF_HasValueElem) ); - xmpParent->options &= ~ (kXMP_PropValueIsStruct | kRDF_HasValueElem); + xmpParent->options &= ~ (static_cast(kXMP_PropValueIsStruct) | static_cast(kRDF_HasValueElem)); xmpParent->options |= valueNode->options; xmpParent->value.swap ( valueNode->value ); diff --git a/xmpsdk/src/XMPCore_Impl.cpp b/xmpsdk/src/XMPCore_Impl.cpp index e3632b9866..b810bfe929 100644 --- a/xmpsdk/src/XMPCore_Impl.cpp +++ b/xmpsdk/src/XMPCore_Impl.cpp @@ -948,7 +948,7 @@ FindQualifierNode ( XMP_Node * parent, if ( (qualNode == 0) && createNodes ) { - qualNode = new XMP_Node ( parent, qualName, (kXMP_PropIsQualifier | kXMP_NewImplicitNode) ); + qualNode = new XMP_Node ( parent, qualName, (static_cast(kXMP_PropIsQualifier) | static_cast(kXMP_NewImplicitNode)) ); parent->options |= kXMP_PropHasQualifiers; const bool isLang = XMP_LitMatch ( qualName, "xml:lang" );