cargilld 2004/07/06 07:58:15
Modified: c/samples/PSVIWriter PSVIWriterHandlers.cpp
c/src/xercesc/framework/psvi XSAttributeDeclaration.cpp
XSAttributeUse.cpp XSConstants.hpp
XSElementDeclaration.cpp
c/src/xercesc/internal XSObjectFactory.cpp
Log:
Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX system
header which already uses VC_DEFAULT as a macro. Will need to document that this fix
breaks source code compatibility.
Revision Changes Path
1.7 +3 -3 xml-xerces/c/samples/PSVIWriter/PSVIWriterHandlers.cpp
Index: PSVIWriterHandlers.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/PSVIWriter/PSVIWriterHandlers.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PSVIWriterHandlers.cpp 14 Apr 2004 21:33:56 -0000 1.6
+++ PSVIWriterHandlers.cpp 6 Jul 2004 14:58:15 -0000 1.7
@@ -1009,7 +1009,7 @@
}
void PSVIWriterHandlers::processValueConstraint(XSConstants::VALUE_CONSTRAINT
valueConstraintType, const XMLCh* constraintValue) {
- if (valueConstraintType == XSConstants::VC_NONE) {
+ if (valueConstraintType == XSConstants::VALUE_CONSTRAINT_NONE) {
sendElementEmpty(PSVIUni::fgValueConstraint);
} else {
sendIndentedElement(PSVIUni::fgValueConstraint);
@@ -1296,9 +1296,9 @@
const XMLCh*
PSVIWriterHandlers::translateValueConstraint(XSConstants::VALUE_CONSTRAINT
constraintKind) {
switch (constraintKind) {
- case XSConstants::VC_DEFAULT :
+ case XSConstants::VALUE_CONSTRAINT_DEFAULT :
return PSVIUni::fgDefault;
- case XSConstants::VC_FIXED :
+ case XSConstants::VALUE_CONSTRAINT_FIXED :
return PSVIUni::fgFixed;
default :
return PSVIUni::fgUnknown;
1.14 +7 -4
xml-xerces/c/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp
Index: XSAttributeDeclaration.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSAttributeDeclaration.cpp 4 May 2004 19:02:40 -0000 1.13
+++ XSAttributeDeclaration.cpp 6 Jul 2004 14:58:15 -0000 1.14
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2004/07/06 14:58:15 cargilld
+ * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX
system header which already uses VC_DEFAULT as a macro. Will need to document that
this fix breaks source code compatibility.
+ *
* Revision 1.13 2004/05/04 19:02:40 cargilld
* Enable IDs to work on all kinds of schema components
*
@@ -160,16 +163,16 @@
XSConstants::VALUE_CONSTRAINT XSAttributeDeclaration::getConstraintType() const
{
if (fScope != XSConstants::SCOPE_GLOBAL)
- return XSConstants::VC_NONE;
+ return XSConstants::VALUE_CONSTRAINT_NONE;
if (fAttDef->getDefaultType() == XMLAttDef::Default)
- return XSConstants::VC_DEFAULT;
+ return XSConstants::VALUE_CONSTRAINT_DEFAULT;
if ((fAttDef->getDefaultType() == XMLAttDef::Fixed) ||
(fAttDef->getDefaultType() == XMLAttDef::Required_And_Fixed))
- return XSConstants::VC_FIXED;
+ return XSConstants::VALUE_CONSTRAINT_FIXED;
- return XSConstants::VC_NONE;
+ return XSConstants::VALUE_CONSTRAINT_NONE;
}
const XMLCh *XSAttributeDeclaration::getConstraintValue()
1.7 +4 -1 xml-xerces/c/src/xercesc/framework/psvi/XSAttributeUse.cpp
Index: XSAttributeUse.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSAttributeUse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSAttributeUse.cpp 17 Dec 2003 20:50:34 -0000 1.6
+++ XSAttributeUse.cpp 6 Jul 2004 14:58:15 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/07/06 14:58:15 cargilld
+ * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX
system header which already uses VC_DEFAULT as a macro. Will need to document that
this fix breaks source code compatibility.
+ *
* Revision 1.6 2003/12/17 20:50:34 knoaman
* PSVI: fix for annotation of attributes in attributeGroup/derived types
*
@@ -91,7 +94,7 @@
MemoryManager* const manager)
: XSObject(XSConstants::ATTRIBUTE_USE, xsModel, manager)
, fRequired(false)
- , fConstraintType(XSConstants::VC_NONE)
+ , fConstraintType(XSConstants::VALUE_CONSTRAINT_NONE)
, fConstraintValue(0)
, fXSAttributeDeclaration(xsAttDecl)
{
1.4 +6 -3 xml-xerces/c/src/xercesc/framework/psvi/XSConstants.hpp
Index: XSConstants.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSConstants.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSConstants.hpp 29 Jan 2004 11:46:30 -0000 1.3
+++ XSConstants.hpp 6 Jul 2004 14:58:15 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/07/06 14:58:15 cargilld
+ * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX
system header which already uses VC_DEFAULT as a macro. Will need to document that
this fix breaks source code compatibility.
+ *
* Revision 1.3 2004/01/29 11:46:30 cargilld
* Code cleanup changes to get rid of various compiler diagnostic messages.
*
@@ -221,15 +224,15 @@
/**
* Indicates that the component does not have any value constraint.
*/
- VC_NONE = 0,
+ VALUE_CONSTRAINT_NONE = 0,
/**
* Indicates that there is a default value constraint.
*/
- VC_DEFAULT = 1,
+ VALUE_CONSTRAINT_DEFAULT = 1,
/**
* Indicates that there is a fixed value constraint for this attribute.
*/
- VC_FIXED = 2
+ VALUE_CONSTRAINT_FIXED = 2
};
private:
1.12 +6 -3 xml-xerces/c/src/xercesc/framework/psvi/XSElementDeclaration.cpp
Index: XSElementDeclaration.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSElementDeclaration.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSElementDeclaration.cpp 4 May 2004 19:02:40 -0000 1.11
+++ XSElementDeclaration.cpp 6 Jul 2004 14:58:15 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/07/06 14:58:15 cargilld
+ * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX
system header which already uses VC_DEFAULT as a macro. Will need to document that
this fix breaks source code compatibility.
+ *
* Revision 1.11 2004/05/04 19:02:40 cargilld
* Enable IDs to work on all kinds of schema components
*
@@ -188,12 +191,12 @@
XSConstants::VALUE_CONSTRAINT XSElementDeclaration::getConstraintType() const
{
if (fSchemaElementDecl->getMiscFlags() & SchemaSymbols::XSD_FIXED)
- return XSConstants::VC_FIXED;
+ return XSConstants::VALUE_CONSTRAINT_FIXED;
if (fSchemaElementDecl->getDefaultValue())
- return XSConstants::VC_DEFAULT;
+ return XSConstants::VALUE_CONSTRAINT_DEFAULT;
- return XSConstants::VC_NONE;
+ return XSConstants::VALUE_CONSTRAINT_NONE;
}
const XMLCh *XSElementDeclaration::getConstraintValue()
1.22 +6 -3 xml-xerces/c/src/xercesc/internal/XSObjectFactory.cpp
Index: XSObjectFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSObjectFactory.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XSObjectFactory.cpp 5 Mar 2004 16:28:21 -0000 1.21
+++ XSObjectFactory.cpp 6 Jul 2004 14:58:15 -0000 1.22
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.22 2004/07/06 14:58:15 cargilld
+ * Rename VALUE_CONSTRAINT enumeration names to avoid naming conflict with AIX
system header which already uses VC_DEFAULT as a macro. Will need to document that
this fix breaks source code compatibility.
+ *
* Revision 1.21 2004/03/05 16:28:21 knoaman
* PSVI: prohibited attributes should not be part of attribute use. Patch by Mike
Boos.
*
@@ -1116,16 +1119,16 @@
XSAttributeUse* const xsAttUse)
{
bool isRequired = false;
- XSConstants::VALUE_CONSTRAINT constraintType = XSConstants::VC_NONE;
+ XSConstants::VALUE_CONSTRAINT constraintType =
XSConstants::VALUE_CONSTRAINT_NONE;
if (attDef->getDefaultType() == XMLAttDef::Default)
{
- constraintType = XSConstants::VC_DEFAULT;
+ constraintType = XSConstants::VALUE_CONSTRAINT_DEFAULT;
}
else if ((attDef->getDefaultType() == XMLAttDef::Fixed) ||
(attDef->getDefaultType() == XMLAttDef::Required_And_Fixed))
{
- constraintType = XSConstants::VC_FIXED;
+ constraintType = XSConstants::VALUE_CONSTRAINT_FIXED;
}
if (attDef->getDefaultType() == XMLAttDef::Required ||
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
