knoaman 2003/01/27 08:59:52
Modified: c/src/xercesc/validators/schema TraverseSchema.cpp
Log:
No need for temp var.
Revision Changes Path
1.60 +4 -9 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
Index: TraverseSchema.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- TraverseSchema.cpp 16 Jan 2003 18:32:38 -0000 1.59
+++ TraverseSchema.cpp 27 Jan 2003 16:59:49 -0000 1.60
@@ -4459,15 +4459,10 @@
if (baseValidator == 0) {
reportSchemaError(elem, XMLUni::fgValidityDomain,
XMLValid::UnknownBaseDatatype, baseTypeName, derivedTypeName);
}
- else {
+ else if ((baseValidator->getFinalSet() & baseRefContext) != 0) {
- int finalSet = baseValidator->getFinalSet();
-
- if (finalSet !=0 && ((finalSet & baseRefContext) != 0)) {
-
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::DisallowedBaseDerivation, baseTypeName);
- return 0;
- }
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::DisallowedBaseDerivation, baseTypeName);
+ return 0;
}
return baseValidator;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
