Author: cargilld
Date: Fri Aug 12 13:47:02 2005
New Revision: 232378
URL: http://svn.apache.org/viewcvs?rev=232378&view=rev
Log:
Change uppercase enums that were conflicting with other products.
Modified:
xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Key.hpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Unique.hpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraintHandler.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Key.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Key.hpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Key.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Key.hpp Fri Aug 12
13:47:02 2005
@@ -66,7 +66,7 @@
// ---------------------------------------------------------------------------
inline short IC_Key::getType() const {
- return IdentityConstraint::KEY;
+ return IdentityConstraint::ICType_KEY;
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/IC_KeyRef.hpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/IC_KeyRef.hpp Fri Aug
12 13:47:02 2005
@@ -73,7 +73,7 @@
// ---------------------------------------------------------------------------
inline short IC_KeyRef::getType() const {
- return IdentityConstraint::KEYREF;
+ return IdentityConstraint::ICType_KEYREF;
}
inline IdentityConstraint* IC_KeyRef::getKey() const {
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Unique.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Unique.hpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Unique.hpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Unique.hpp Fri Aug
12 13:47:02 2005
@@ -70,7 +70,7 @@
// ---------------------------------------------------------------------------
inline short IC_Unique::getType() const {
- return IdentityConstraint::UNIQUE;
+ return IdentityConstraint::ICType_UNIQUE;
}
XERCES_CPP_NAMESPACE_END
Modified:
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.cpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
(original)
+++
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
Fri Aug 12 13:47:02 2005
@@ -184,7 +184,7 @@
}
else
{
- serEng<<(int) UNKNOWN;
+ serEng<<(int) ICType_UNKNOWN;
}
}
@@ -197,19 +197,19 @@
switch((ICType)type)
{
- case UNIQUE:
+ case ICType_UNIQUE:
IC_Unique* ic_unique;
serEng>>ic_unique;
return ic_unique;
- case KEY:
+ case ICType_KEY:
IC_Key* ic_key;
serEng>>ic_key;
return ic_key;
- case KEYREF:
+ case ICType_KEYREF:
IC_KeyRef* ic_keyref;
serEng>>ic_keyref;
return ic_keyref;
- case UNKNOWN:
+ case ICType_UNKNOWN:
return 0;
default: //we treat this same as UnKnown
return 0;
Modified:
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.hpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
(original)
+++
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
Fri Aug 12 13:47:02 2005
@@ -48,10 +48,10 @@
// Constants
// -----------------------------------------------------------------------
enum ICType {
- UNIQUE = 0,
- KEY = 1,
- KEYREF = 2,
- UNKNOWN
+ ICType_UNIQUE = 0,
+ ICType_KEY = 1,
+ ICType_KEYREF = 2,
+ ICType_UNKNOWN
};
// -----------------------------------------------------------------------
Modified:
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraintHandler.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraintHandler.cpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
---
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraintHandler.cpp
(original)
+++
xerces/c/trunk/src/xercesc/validators/schema/identity/IdentityConstraintHandler.cpp
Fri Aug 12 13:47:02 2005
@@ -102,7 +102,7 @@
XPathMatcher* matcher = fMatcherStack->getMatcherAt(j);
IdentityConstraint* ic = matcher->getIdentityConstraint();
- if (ic && (ic->getType() != IdentityConstraint::KEYREF))
+ if (ic && (ic->getType() != IdentityConstraint::ICType_KEYREF))
fValueStoreCache->transplant(ic, matcher->getInitialDepth());
}
@@ -112,7 +112,7 @@
XPathMatcher* matcher = fMatcherStack->getMatcherAt(k);
IdentityConstraint* ic = matcher->getIdentityConstraint();
- if (ic && (ic->getType() == IdentityConstraint::KEYREF))
+ if (ic && (ic->getType() == IdentityConstraint::ICType_KEYREF))
{
ValueStore* values = fValueStoreCache->getValueStoreFor(ic,
matcher->getInitialDepth());
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp Fri
Aug 12 13:47:02 2005
@@ -148,7 +148,7 @@
if (fValuesCount == 0) {
- if (fIdentityConstraint->getType() == IdentityConstraint::KEY &&
fDoReportError) {
+ if (fIdentityConstraint->getType() == IdentityConstraint::ICType_KEY
&& fDoReportError) {
fScanner->getValidator()->emitError(XMLValid::IC_AbsentKeyValue,
fIdentityConstraint->getElementName());
}
@@ -160,19 +160,19 @@
if ((fValuesCount != fIdentityConstraint->getFieldCount()) &&
fDoReportError) {
switch (fIdentityConstraint->getType()) {
- case IdentityConstraint::UNIQUE:
+ case IdentityConstraint::ICType_UNIQUE:
{
fScanner->getValidator()->emitError(XMLValid::IC_UniqueNotEnoughValues,
fIdentityConstraint->getElementName());
break;
}
- case IdentityConstraint::KEY:
+ case IdentityConstraint::ICType_KEY:
{
fScanner->getValidator()->emitError(XMLValid::IC_KeyNotEnoughValues,
fIdentityConstraint->getElementName(),
fIdentityConstraint->getIdentityConstraintName());
break;
}
- case IdentityConstraint::KEYREF:
+ case IdentityConstraint::ICType_KEYREF:
{
fScanner->getValidator()->emitError(XMLValid::IC_KeyRefNotEnoughValues,
fIdentityConstraint->getElementName(),
fIdentityConstraint->getIdentityConstraintName());
@@ -270,7 +270,7 @@
// ---------------------------------------------------------------------------
void ValueStore::endDcocumentFragment(ValueStoreCache* const valueStoreCache) {
- if (fIdentityConstraint->getType() == IdentityConstraint::KEYREF) {
+ if (fIdentityConstraint->getType() == IdentityConstraint::ICType_KEYREF) {
// verify references
// get the key store corresponding (if it exists):
@@ -306,7 +306,7 @@
// ---------------------------------------------------------------------------
void ValueStore::reportNilError(IdentityConstraint* const ic) {
- if (fDoReportError && ic->getType() == IdentityConstraint::KEY) {
+ if (fDoReportError && ic->getType() == IdentityConstraint::ICType_KEY) {
fScanner->getValidator()->emitError(XMLValid::IC_KeyMatchesNillable,
ic->getElementName());
}
@@ -317,13 +317,13 @@
if (fDoReportError) {
switch (fIdentityConstraint->getType()) {
- case IdentityConstraint::UNIQUE:
+ case IdentityConstraint::ICType_UNIQUE:
{
fScanner->getValidator()->emitError(XMLValid::IC_DuplicateUnique,
fIdentityConstraint->getElementName());
break;
}
- case IdentityConstraint::KEY:
+ case IdentityConstraint::ICType_KEY:
{
fScanner->getValidator()->emitError(XMLValid::IC_DuplicateKey,
fIdentityConstraint->getElementName());
Modified:
xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStoreCache.cpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStoreCache.cpp
Fri Aug 12 13:47:02 2005
@@ -160,7 +160,7 @@
void ValueStoreCache::transplant(IdentityConstraint* const ic, const int
initialDepth) {
- if (ic->getType() == IdentityConstraint::KEYREF) {
+ if (ic->getType() == IdentityConstraint::ICType_KEYREF) {
return;
}
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp Fri
Aug 12 13:47:02 2005
@@ -64,7 +64,7 @@
}
XercesNodeTest::XercesNodeTest(const QName* const qName)
- : fType(QNAME)
+ : fType(NodeType_QNAME)
, fName(new (qName->getMemoryManager()) QName(*qName))
{
}
@@ -72,7 +72,7 @@
XercesNodeTest::XercesNodeTest(const XMLCh* const prefix,
const unsigned int uriId,
MemoryManager* const manager)
- : fType(NAMESPACE)
+ : fType(NodeType_NAMESPACE)
, fName(new (manager) QName(manager))
{
fName->setURI(uriId);
@@ -109,7 +109,7 @@
}
XercesNodeTest::XercesNodeTest(MemoryManager* const)
-:fType(UNKNOWN)
+:fType(NodeType_UNKNOWN)
,fName(0)
{
}
@@ -184,8 +184,8 @@
if (fAxisType != other.fAxisType)
return false;
- if (fAxisType == XercesStep::CHILD ||
- fAxisType == XercesStep::ATTRIBUTE) {
+ if (fAxisType == XercesStep::AxisType_CHILD ||
+ fAxisType == XercesStep::AxisType_ATTRIBUTE) {
return (*fNodeTest == *(other.fNodeTest));
}
@@ -221,7 +221,7 @@
}
XercesStep::XercesStep(MemoryManager* const)
-:fAxisType(UNKNOWN)
+:fAxisType(AxisType_UNKNOWN)
,fNodeTest(0)
{
}
@@ -371,7 +371,7 @@
unsigned int stepSize = locPath->getStepSize();
if (stepSize) {
- if (locPath->getStep(stepSize - 1)->getAxisType() ==
XercesStep::ATTRIBUTE) {
+ if (locPath->getStep(stepSize - 1)->getAxisType() ==
XercesStep::AxisType_ATTRIBUTE) {
ThrowXMLwithMemMgr(XPathException,
XMLExcepts::XPath_NoAttrSelector, fMemoryManager);
}
}
@@ -450,8 +450,8 @@
case XercesXPath::EXPRTOKEN_NAMETEST_ANY:
{
- XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::WILDCARD, fMemoryManager);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::ATTRIBUTE, nodeTest);
+ XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::NodeType_WILDCARD, fMemoryManager);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_ATTRIBUTE, nodeTest);
stepsVector->addElement(step);
break;
}
@@ -480,7 +480,7 @@
// build step
XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(prefix, uri, fMemoryManager);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::ATTRIBUTE, nodeTest);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_ATTRIBUTE, nodeTest);
stepsVector->addElement(step);
break;
}
@@ -492,7 +492,7 @@
// build step
XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(&aQName);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::ATTRIBUTE, nodeTest);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_ATTRIBUTE, nodeTest);
stepsVector->addElement(step);
break;
}
@@ -520,8 +520,8 @@
}
case XercesXPath::EXPRTOKEN_NAMETEST_ANY:
{
- XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::WILDCARD, fMemoryManager);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::CHILD, nodeTest);
+ XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::NodeType_WILDCARD, fMemoryManager);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_CHILD, nodeTest);
stepsVector->addElement(step);
firstTokenOfLocationPath = false;
break;
@@ -552,7 +552,7 @@
// build step
XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(prefix, uri, fMemoryManager);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::CHILD, nodeTest);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_CHILD, nodeTest);
stepsVector->addElement(step);
break;
}
@@ -563,7 +563,7 @@
// build step
XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(&aQName);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::CHILD, nodeTest);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_CHILD, nodeTest);
stepsVector->addElement(step);
firstTokenOfLocationPath = false;
break;
@@ -571,8 +571,8 @@
case XercesXPath::EXPRTOKEN_PERIOD:
{
// build step
- XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::NODE, fMemoryManager);
- XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::SELF, nodeTest);
+ XercesNodeTest* nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::NodeType_NODE, fMemoryManager);
+ XercesStep* step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_SELF, nodeTest);
stepsVector->addElement(step);
if (firstTokenOfLocationPath && i+1 < tokenCount) {
@@ -594,8 +594,8 @@
}
}
// build step
- nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::NODE, fMemoryManager);
- step = new (fMemoryManager)
XercesStep(XercesStep::DESCENDANT, nodeTest);
+ nodeTest = new (fMemoryManager)
XercesNodeTest(XercesNodeTest::NodeType_NODE, fMemoryManager);
+ step = new (fMemoryManager)
XercesStep(XercesStep::AxisType_DESCENDANT, nodeTest);
stepsVector->addElement(step);
}
}
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp?rev=232378&r1=232377&r2=232378&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.hpp Fri
Aug 12 13:47:02 2005
@@ -46,12 +46,12 @@
// -----------------------------------------------------------------------
// Constants
// -----------------------------------------------------------------------
- enum {
- QNAME = 1,
- WILDCARD = 2,
- NODE = 3,
- NAMESPACE= 4,
- UNKNOWN
+ enum NodeType {
+ NodeType_QNAME = 1,
+ NodeType_WILDCARD = 2,
+ NodeType_NODE = 3,
+ NodeType_NAMESPACE= 4,
+ NodeType_UNKNOWN
};
// -----------------------------------------------------------------------
@@ -103,12 +103,12 @@
// -----------------------------------------------------------------------
// Constants
// -----------------------------------------------------------------------
- enum { // Axis type
- CHILD = 1,
- ATTRIBUTE = 2,
- SELF = 3,
- DESCENDANT = 4,
- UNKNOWN
+ enum AxisType { // Axis type
+ AxisType_CHILD = 1,
+ AxisType_ATTRIBUTE = 2,
+ AxisType_SELF = 3,
+ AxisType_DESCENDANT = 4,
+ AxisType_UNKNOWN
};
// -----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
