diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:06:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:06:43 +0100 |
| commit | bde68094dd387503f904f1131a5da888500667e7 (patch) | |
| tree | 2a2b7cdc8a013eec1411fa290d9c621c27249b87 | |
| parent | f5e182f271daa24d743f266b219f0f21f4003726 (diff) | |
| parent | 4c155d94a294ace4a402f135272f04bcd73f4732 (diff) | |
| download | qtxmlpatterns-bde68094dd387503f904f1131a5da888500667e7.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I76d2acc6e6189b94b951e28d3ceff93817a3bc1c
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemahelper.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/schema/qxsdschemahelper.cpp b/src/xmlpatterns/schema/qxsdschemahelper.cpp index cdaa1c2..843e7c5 100644 --- a/src/xmlpatterns/schema/qxsdschemahelper.cpp +++ b/src/xmlpatterns/schema/qxsdschemahelper.cpp @@ -388,7 +388,7 @@ XsdWildcard::Ptr XsdSchemaHelper::wildcardIntersection(const XsdWildcard::Ptr &w static SchemaType::DerivationConstraints convertBlockingConstraints(const NamedSchemaComponent::BlockingConstraints &constraints) { - SchemaType::DerivationConstraints result = 0; + SchemaType::DerivationConstraints result; if (constraints & NamedSchemaComponent::RestrictionConstraint) result |= SchemaType::RestrictionConstraint; diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp index 7e60667..7661569 100644 --- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp +++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp @@ -489,7 +489,7 @@ bool XsdValidatingInstanceReader::validateElement(const XsdElement::Ptr &declara } // 4.2 - SchemaType::DerivationConstraints constraints = 0; + SchemaType::DerivationConstraints constraints; if (declaration->disallowedSubstitutions() & NamedSchemaComponent::ExtensionConstraint) constraints |= SchemaType::ExtensionConstraint; if (declaration->disallowedSubstitutions() & NamedSchemaComponent::RestrictionConstraint) |