kopia lustrzana https://github.com/gopro/gpr
build: update to C++20
rodzic
ea25ea0ad9
commit
4eb6994c26
|
@ -711,7 +711,7 @@ void RDF_Parser::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<unsigned long>(kXMP_PropValueIsStruct) | static_cast<unsigned long>(kRDF_HasValueElem));
|
||||
xmpParent->options |= valueNode->options;
|
||||
|
||||
xmpParent->value.swap ( valueNode->value );
|
||||
|
@ -725,7 +725,7 @@ void RDF_Parser::FixupQualifiedNode ( XMP_Node * xmpParent )
|
|||
}
|
||||
|
||||
delete valueNode;
|
||||
|
||||
|
||||
} // RDF_Parser::FixupQualifiedNode
|
||||
|
||||
// =================================================================================================
|
||||
|
|
|
@ -853,7 +853,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<unsigned long>(kXMP_PropIsQualifier) | static_cast<unsigned long>(kXMP_NewImplicitNode)) );
|
||||
parent->options |= kXMP_PropHasQualifiers;
|
||||
|
||||
const bool isLang = XMP_LitMatch ( qualName, "xml:lang" );
|
||||
|
|
Ładowanie…
Reference in New Issue