You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2004/01/29 12:52:32 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/schema/identity IC_Field.cpp IdentityConstraint.cpp ValueStore.cpp XercesXPath.cpp XPathMatcher.cpp XPathMatcher.hpp XPathSymbols.hpp
cargilld 2004/01/29 03:52:32
Modified: c/src/xercesc/validators/DTD DTDAttDef.hpp DTDAttDefList.cpp
DTDAttDefList.hpp DTDElementDecl.cpp
DTDElementDecl.hpp DTDGrammar.cpp DTDGrammar.hpp
DTDScanner.cpp DTDScanner.hpp DTDValidator.cpp
DTDValidator.hpp
c/src/xercesc/validators/schema ComplexTypeInfo.cpp
GeneralAttributeCheck.cpp SchemaAttDef.cpp
SchemaAttDef.hpp SchemaAttDefList.cpp
SchemaAttDefList.hpp SchemaElementDecl.cpp
SchemaElementDecl.hpp SchemaGrammar.cpp
SchemaGrammar.hpp SchemaInfo.hpp SchemaSymbols.hpp
SchemaValidator.cpp SchemaValidator.hpp
SubstitutionGroupComparator.hpp TraverseSchema.cpp
TraverseSchema.hpp XSDDOMParser.cpp
XSDDOMParser.hpp XUtil.hpp
c/src/xercesc/validators/schema/identity IC_Field.cpp
IdentityConstraint.cpp ValueStore.cpp
XercesXPath.cpp XPathMatcher.cpp XPathMatcher.hpp
XPathSymbols.hpp
Log:
Code cleanup changes to get rid of various compiler diagnostic messages.
Revision Changes Path
1.8 +9 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDef.hpp
Index: DTDAttDef.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDef.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DTDAttDef.hpp 17 Dec 2003 00:18:40 -0000 1.7
+++ DTDAttDef.hpp 29 Jan 2004 11:52:30 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:40 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -163,6 +166,12 @@
DECL_XSERIALIZABLE(DTDAttDef)
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDAttDef(const DTDAttDef &);
+ DTDAttDef& operator = (const DTDAttDef&);
+
// -----------------------------------------------------------------------
// Private data members
//
1.9 +7 -4 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.cpp
Index: DTDAttDefList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DTDAttDefList.cpp 17 Dec 2003 00:18:40 -0000 1.8
+++ DTDAttDefList.cpp 29 Jan 2004 11:52:30 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:40 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -144,7 +147,7 @@
}
-XMLAttDef* DTDAttDefList::findAttDef(const unsigned long uriID
+XMLAttDef* DTDAttDefList::findAttDef(const unsigned long
, const XMLCh* const attName)
{
// We don't use the URI, so we just look up the name
@@ -153,7 +156,7 @@
const XMLAttDef*
-DTDAttDefList::findAttDef( const unsigned long uriID
+DTDAttDefList::findAttDef( const unsigned long
, const XMLCh* const attName) const
{
// We don't use the URI, so we just look up the name
@@ -161,7 +164,7 @@
}
-XMLAttDef* DTDAttDefList::findAttDef( const XMLCh* const attURI
+XMLAttDef* DTDAttDefList::findAttDef( const XMLCh* const
, const XMLCh* const attName)
{
// We don't use the URI, so we just look up the name
@@ -170,7 +173,7 @@
const XMLAttDef*
-DTDAttDefList::findAttDef( const XMLCh* const attURI
+DTDAttDefList::findAttDef( const XMLCh* const
, const XMLCh* const attName) const
{
// We don't use the URI, so we just look up the name
1.7 +9 -1 xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.hpp
Index: DTDAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDAttDefList.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DTDAttDefList.hpp 10 Nov 2003 21:54:51 -0000 1.6
+++ DTDAttDefList.hpp 29 Jan 2004 11:52:30 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/11/10 21:54:51 neilg
* implementation for new stateless means of traversing attribute definition lists
*
@@ -194,6 +197,11 @@
private :
void addAttDef(DTDAttDef *toAdd);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDAttDefList(const DTDAttDefList &);
+ DTDAttDefList& operator = (const DTDAttDefList&);
// -----------------------------------------------------------------------
// Private data members
1.16 +4 -4 xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.cpp
Index: DTDElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DTDElementDecl.cpp 17 Dec 2003 00:18:40 -0000 1.15
+++ DTDElementDecl.cpp 29 Jan 2004 11:52:30 -0000 1.16
@@ -136,9 +136,9 @@
// The virtual element decl interface
// ---------------------------------------------------------------------------
XMLAttDef* DTDElementDecl::findAttr(const XMLCh* const qName
- , const unsigned int uriId
- , const XMLCh* const baseName
- , const XMLCh* const prefix
+ , const unsigned int
+ , const XMLCh* const
+ , const XMLCh* const
, const LookupOpts options
, bool& wasAdded) const
{
1.9 +8 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.hpp
Index: DTDElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DTDElementDecl.hpp 12 Dec 2003 18:35:44 -0000 1.8
+++ DTDElementDecl.hpp 29 Jan 2004 11:52:30 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/12 18:35:44 peiyongz
* getObjectType()
*
@@ -252,6 +255,11 @@
XMLContentModel* makeContentModel() ;
XMLCh* formatContentModel () const ;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDElementDecl(const DTDElementDecl &);
+ DTDElementDecl& operator = (const DTDElementDecl&);
// -----------------------------------------------------------------------
// Private data members
1.16 +7 -4 xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.cpp
Index: DTDGrammar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DTDGrammar.cpp 13 Jan 2004 16:17:09 -0000 1.15
+++ DTDGrammar.cpp 29 Jan 2004 11:52:30 -0000 1.16
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.15 2004/01/13 16:17:09 knoaman
* Fo sanity, use class name to qualify method
*
@@ -205,7 +208,7 @@
// -----------------------------------------------------------------------
XMLElementDecl* DTDGrammar::findOrAddElemDecl (const unsigned int uriId
, const XMLCh* const baseName
- , const XMLCh* const prefixName
+ , const XMLCh* const
, const XMLCh* const qName
, unsigned int scope
, bool& wasAdded )
@@ -237,10 +240,10 @@
}
XMLElementDecl* DTDGrammar::putElemDecl (const unsigned int uriId
- , const XMLCh* const baseName
- , const XMLCh* const prefixName
+ , const XMLCh* const
+ , const XMLCh* const
, const XMLCh* const qName
- , unsigned int scope
+ , unsigned int
, const bool notDeclared)
{
DTDElementDecl* retVal = new (fMemoryManager) DTDElementDecl
1.14 +8 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.hpp
Index: DTDGrammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DTDGrammar.hpp 22 Dec 2003 15:22:58 -0000 1.13
+++ DTDGrammar.hpp 29 Jan 2004 11:52:30 -0000 1.14
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.13 2003/12/22 15:22:58 gareth
* made getRootElemID const. Bug #25699
*
@@ -283,6 +286,11 @@
// -----------------------------------------------------------------------
void resetEntityDeclPool();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDGrammar(const DTDGrammar &);
+ DTDGrammar& operator = (const DTDGrammar&);
// -----------------------------------------------------------------------
// Private data members
1.32 +45 -40 xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp
Index: DTDScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DTDScanner.cpp 31 Dec 2003 15:40:00 -0000 1.31
+++ DTDScanner.cpp 29 Jan 2004 11:52:30 -0000 1.32
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.32 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.31 2003/12/31 15:40:00 cargilld
* Release memory when an error is encountered.
*
@@ -331,6 +334,10 @@
, fDTDGrammar(dtdGrammar)
, fPEntityDeclPool(0)
, fDocTypeReaderId(0)
+ , fBufMgr(0)
+ , fReaderMgr(0)
+ , fScanner(0)
+ , fEmptyNamespaceId(0)
{
fPEntityDeclPool = new (fMemoryManager) NameIdPool<DTDEntityDecl>(109, 128, fMemoryManager);
}
@@ -367,10 +374,8 @@
// ---------------------------------------------------------------------------
// DTDScanner: Private scanning methods
// ---------------------------------------------------------------------------
-bool DTDScanner::checkForPERef(const bool spaceRequired
- , const bool inLiteral
- , const bool inMarkup
- , const bool throwAtEndExt)
+bool DTDScanner::checkForPERef( const bool inLiteral
+ , const bool inMarkup)
{
bool gotSpace = false;
@@ -390,7 +395,7 @@
while (true)
{
- if (!expandPERef(false, inLiteral, inMarkup, throwAtEndExt))
+ if (!expandPERef(false, inLiteral, inMarkup, false))
fScanner->emitError(XMLErrs::ExpectedEntityRefName);
// And skip any more spaces in the expanded value
if (fReaderMgr->skippedSpace())
@@ -617,7 +622,7 @@
DTDScanner::scanAttDef(DTDElementDecl& parentElem, XMLBuffer& bufToUse)
{
// Check for PE ref or optional whitespace
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// Get the name of the attribute
if (!fReaderMgr->getName(bufToUse))
@@ -672,7 +677,7 @@
const bool isIgnored = (decl == fDumAttDef);
// Space is required here, so check for PE ref, and require space
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
//
@@ -723,7 +728,7 @@
else if (fReaderMgr->skippedString(XMLUni::fgNotationString))
{
// Check for PE ref and require space
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
decl->setType(XMLAttDef::Notation);
@@ -754,7 +759,7 @@
}
// Space is required here, so check for PE ref, and require space
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
// And then scan for the optional default value declaration
@@ -808,7 +813,7 @@
void DTDScanner::scanAttListDecl()
{
// Space is required here, so check for a PE ref
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
{
fScanner->emitError(XMLErrs::ExpectedWhitespace);
fReaderMgr->skipPastChar(chCloseAngle);
@@ -1254,7 +1259,7 @@
DTDScanner::scanChildren(const DTDElementDecl& elemDecl, XMLBuffer& bufToUse)
{
// Check for a PE ref here, but don't require spaces
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// We have to check entity nesting here
unsigned int curReader;
@@ -1317,7 +1322,7 @@
);
// Check for a PE ref here, but don't require spaces
- const bool gotSpaces = checkForPERef(false, false, true);
+ const bool gotSpaces = checkForPERef(false, true);
// Check for a repetition character after the leaf
const XMLCh repCh = fReaderMgr->peekNextChar();
@@ -1338,7 +1343,7 @@
}
// Check for a PE ref here, but don't require spaces
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
//
// Ok, the next character tells us what kind of content this particular
@@ -1418,7 +1423,7 @@
//
if (fReaderMgr->lookingAtChar(chPercent))
{
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
}
else if (fReaderMgr->skippedSpace())
{
@@ -1449,7 +1454,7 @@
else if (fReaderMgr->skippedChar(opCh))
{
// Check for a PE ref here, but don't require spaces
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
if (fReaderMgr->skippedChar(chOpenParen))
{
@@ -1741,7 +1746,7 @@
const unsigned int curReader = fReaderMgr->getCurrentReaderNum();
// We could have a PE ref here, but don't require space
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
//
// Now we look for a PCDATA string. If its PCDATA, then it must be a
@@ -1825,7 +1830,7 @@
// an empty string and try to keep going.
//
// Check for PE ref or optional whitespace
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
XMLBufBid bbValue(fBufMgr);
if (!scanAttValue(toFill.getFullName(), bbValue.getBuffer(), toFill.getType()))
@@ -1847,7 +1852,7 @@
// we don't get our whitespace, then issue and error, but try to keep
// going.
//
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
// Get a buffer for the element name and scan in the name
@@ -1913,7 +1918,7 @@
decl->setCreateReason(XMLElementDecl::Declared);
// Another check for a PE ref, with at least required whitespace
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
// And now scan the content model for this guy.
@@ -1924,7 +1929,7 @@
}
// Another check for a PE ref, but we don't require whitespace here
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// And we should have the ending angle bracket
if (!fReaderMgr->skippedChar(chCloseAngle))
@@ -1971,7 +1976,7 @@
//
if (isPEDecl)
{
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
}
@@ -2042,7 +2047,7 @@
// we don't get our whitespace, then issue an error, but try to keep
// going.
//
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
// save the hasNoDTD status for Entity Constraint Checking
@@ -2062,7 +2067,7 @@
fScanner->setHasNoDTD(true);
// Space is legal (but not required) here so check for a PE ref
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// And then we have to have the closing angle bracket
if (!fReaderMgr->skippedChar(chCloseAngle))
@@ -2273,7 +2278,7 @@
// scanner, all such entity literals are in entity decls and therefore
// general entities are not expanded.
//
-bool DTDScanner::scanEntityLiteral(XMLBuffer& toFill, const bool isPE)
+bool DTDScanner::scanEntityLiteral(XMLBuffer& toFill)
{
toFill.reset();
@@ -2455,7 +2460,7 @@
// Get a buffer for the literal
XMLBufBid bbValue(fBufMgr);
- if (!scanEntityLiteral(bbValue.getBuffer(), isPEDecl))
+ if (!scanEntityLiteral(bbValue.getBuffer()))
return false;
// Set it on the entity decl
@@ -2483,7 +2488,7 @@
decl.setBaseURI((lastInfo.systemId && *lastInfo.systemId) ? lastInfo.systemId : 0);
// If its a PE decl, we are done
- bool gotSpaces = checkForPERef(false, false, true);
+ bool gotSpaces = checkForPERef(false, true);
if (isPEDecl)
{
//
@@ -2515,7 +2520,7 @@
fScanner->emitError(XMLErrs::ExpectedNDATA);
// Space is required here, but try to go on if not
- if (!checkForPERef(false, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
// Get a name
@@ -2549,7 +2554,7 @@
toFill.reset();
// Check for PE ref but don't require space
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// If this is a notation, we need an opening paren
if (notation)
@@ -2564,7 +2569,7 @@
while (true)
{
// Space is allowed here for either type so check for PE ref
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// And then get either a name or a name token
bool success;
@@ -2587,7 +2592,7 @@
toFill.append(bbTmp.getRawBuffer(), bbTmp.getLen());
// Space is allowed here for either type so check for PE ref
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// Check for the terminating paren
if (fReaderMgr->skippedChar(chCloseParen))
@@ -3258,11 +3263,11 @@
}
// A PE ref can happen here, but space is not required
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
if (fReaderMgr->skippedString(XMLUni::fgIncludeString))
{
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// Check for the following open square bracket
if (!fReaderMgr->skippedChar(chOpenSquare))
@@ -3271,7 +3276,7 @@
// Get the reader we started this on
const unsigned int orgReader = fReaderMgr->getCurrentReaderNum();
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
//
// Recurse back to the ext subset call again, telling it its
@@ -3289,7 +3294,7 @@
}
else if (fReaderMgr->skippedString(XMLUni::fgIgnoreString))
{
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// Check for the following open square bracket
if (!fReaderMgr->skippedChar(chOpenSquare))
@@ -3430,7 +3435,7 @@
if (fReaderMgr->lookingAtChar(chPercent))
{
// Expand it and continue
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
}
else if (fReaderMgr->skippedChar(chAsterisk))
{
@@ -3501,7 +3506,7 @@
starRequired = true;
// Space is legal here so check for a PE ref, but don't require space
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// Get a name token
if (!fReaderMgr->getName(nameBuf))
@@ -3597,7 +3602,7 @@
void DTDScanner::scanNotationDecl()
{
// Space is required here so check for a PE ref, and require space
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
{
fScanner->emitError(XMLErrs::ExpectedWhitespace);
fReaderMgr->skipPastChar(chCloseAngle);
@@ -3624,7 +3629,7 @@
}
// Space is required here so check for a PE ref, and require space
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
{
fScanner->emitError(XMLErrs::ExpectedWhitespace);
fReaderMgr->skipPastChar(chCloseAngle);
@@ -3644,7 +3649,7 @@
}
// We can have an optional space or PE ref here
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
//
// See if it already exists. If so, add it to the notatino decl pool.
@@ -3690,7 +3695,7 @@
}
// And one more optional space or PE ref
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// And skip the terminating bracket
if (!fReaderMgr->skippedChar(chCloseAngle))
1.10 +11 -4 xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.hpp
Index: DTDScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DTDScanner.hpp 10 Jul 2003 19:50:12 -0000 1.9
+++ DTDScanner.hpp 29 Jan 2004 11:52:30 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/07/10 19:50:12 peiyongz
* Stateless Grammar: create grammar components with grammarPool's memory Manager
*
@@ -190,14 +193,18 @@
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDScanner(const DTDScanner &);
+ DTDScanner& operator = (const DTDScanner&);
+
+ // -----------------------------------------------------------------------
// Private DTD scanning methods. These are all in XMLValidator2.cpp
// -----------------------------------------------------------------------
bool checkForPERef
(
- const bool spaceRequired
- , const bool inLiteral
+ const bool inLiteral
, const bool inMarkup
- , const bool throwEndOfExt = false
);
bool expandPERef
(
@@ -227,7 +234,7 @@
void scanElementDecl();
void scanEntityDecl();
bool scanEntityDef();
- bool scanEntityLiteral(XMLBuffer& toFill, const bool isPE);
+ bool scanEntityLiteral(XMLBuffer& toFill);
bool scanEntityDef(DTDEntityDecl& decl, const bool isPEDecl);
EntityExpRes scanEntityRef(XMLCh& firstCh, XMLCh& secondCh, bool& escaped);
bool scanEnumeration
1.19 +4 -8 xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.cpp
Index: DTDValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DTDValidator.cpp 17 Dec 2003 05:50:44 -0000 1.18
+++ DTDValidator.cpp 29 Jan 2004 11:52:30 -0000 1.19
@@ -203,7 +203,7 @@
DTDValidator::validateAttrValue(const XMLAttDef* attDef
, const XMLCh* const attrValue
, bool preValidation
- , const XMLElementDecl* elemDecl)
+ , const XMLElementDecl*)
{
//
// Get quick refs to lost of of the stuff in the passed objects in
@@ -274,8 +274,7 @@
|| (type == XMLAttDef::IDRefs)
);
- // Some trigger flags to avoid issuing redundant errors and whatnot
- bool sawOneValue;
+ // Some trigger flags to avoid issuing redundant errors and whatnot
bool alreadyCapped = false;
//
@@ -307,9 +306,6 @@
while (true)
{
- // Reset the trigger flags
- sawOneValue = false;
-
//
// Make sure the first character is a valid first name char, i.e.
// if its a Name value. For NmToken values we don't treat the first
@@ -459,7 +455,7 @@
}
-void DTDValidator::preContentValidation(bool reuseGrammar,
+void DTDValidator::preContentValidation(bool,
bool validateDefAttr)
{
//
1.7 +8 -0 xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.hpp
Index: DTDValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDValidator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DTDValidator.hpp 7 Nov 2002 21:58:56 -0000 1.6
+++ DTDValidator.hpp 29 Jan 2004 11:52:30 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:52:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2002/11/07 21:58:56 tng
* Pass elemDecl to XMLValidator::validateAttrValue so that we can include element name in error message.
*
@@ -205,6 +208,11 @@
virtual bool handlesSchema() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDValidator(const DTDValidator &);
+ DTDValidator& operator = (const DTDValidator&);
// -----------------------------------------------------------------------
// Private data members
1.26 +8 -5 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp
Index: ComplexTypeInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ComplexTypeInfo.cpp 13 Jan 2004 16:17:09 -0000 1.25
+++ ComplexTypeInfo.cpp 29 Jan 2004 11:52:31 -0000 1.26
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.26 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.25 2004/01/13 16:17:09 knoaman
* Fo sanity, use class name to qualify method
*
@@ -362,16 +365,16 @@
, fDatatypeValidator(0)
, fBaseComplexTypeInfo(0)
, fContentSpec(0)
- , fAttWildCard(0)
- , fAttDefs(0)
+ , fAttWildCard(0)
, fAttList(0)
, fElements(0)
+ , fSpecNodesToDelete(0)
+ , fAttDefs(0)
, fContentModel(0)
, fFormattedModel(0)
, fContentSpecOrgURI(0)
, fUniqueURI(0)
- , fContentSpecOrgURISize(16)
- , fSpecNodesToDelete(0)
+ , fContentSpecOrgURISize(16)
, fLocator(0)
, fMemoryManager(manager)
{
@@ -481,7 +484,7 @@
// ---------------------------------------------------------------------------
// ComplexTypeInfo: Helper methods
// ---------------------------------------------------------------------------
-XMLAttDef* ComplexTypeInfo::findAttr(const XMLCh* const qName
+XMLAttDef* ComplexTypeInfo::findAttr(const XMLCh* const
, const unsigned int uriId
, const XMLCh* const baseName
, const XMLCh* const prefix
1.21 +4 -1 xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
Index: GeneralAttributeCheck.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GeneralAttributeCheck.cpp 13 Jan 2004 16:17:09 -0000 1.20
+++ GeneralAttributeCheck.cpp 29 Jan 2004 11:52:31 -0000 1.21
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.20 2004/01/13 16:17:09 knoaman
* Fo sanity, use class name to qualify method
*
@@ -704,7 +707,7 @@
attList[E_ElementGlobal][A_Default] = Att_Optional;
attList[E_ElementGlobal][A_Final] = Att_Optional;
attList[E_ElementGlobal][A_Fixed] = Att_Optional;
- attList[E_ElementGlobal][A_ID] = Att_Optional | DV_ID;;
+ attList[E_ElementGlobal][A_ID] = Att_Optional | DV_ID;
attList[E_ElementGlobal][A_Name] = Att_Required;
attList[E_ElementGlobal][A_Nillable] = Att_Optional | DV_Boolean;
attList[E_ElementGlobal][A_SubstitutionGroup] = Att_Optional;
1.13 +4 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp
Index: SchemaAttDef.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SchemaAttDef.cpp 24 Dec 2003 17:42:03 -0000 1.12
+++ SchemaAttDef.cpp 29 Jan 2004 11:52:31 -0000 1.13
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/24 17:42:03 knoaman
* Misc. PSVI updates
*
@@ -154,8 +157,8 @@
XMLAttDef(type, defType, manager)
, fElemId(XMLElementDecl::fgInvalidElemId)
, fDatatypeValidator(0)
- , fMemberTypeValidator(0)
, fAnyDatatypeValidator(0)
+ , fMemberTypeValidator(0)
, fNamespaceList(0)
, fValidity(PSVIDefs::UNKNOWN)
, fValidation(PSVIDefs::NONE)
1.12 +9 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.hpp
Index: SchemaAttDef.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SchemaAttDef.hpp 24 Dec 2003 17:42:03 -0000 1.11
+++ SchemaAttDef.hpp 29 Jan 2004 11:52:31 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/12/24 17:42:03 knoaman
* Misc. PSVI updates
*
@@ -312,6 +315,12 @@
DECL_XSERIALIZABLE(SchemaAttDef)
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaAttDef(const SchemaAttDef&);
+ SchemaAttDef& operator=(const SchemaAttDef&);
+
// -----------------------------------------------------------------------
// Private data members
//
1.10 +11 -7 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.cpp
Index: SchemaAttDefList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SchemaAttDefList.cpp 17 Dec 2003 00:18:40 -0000 1.9
+++ SchemaAttDefList.cpp 29 Jan 2004 11:52:31 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/17 00:18:40 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -110,8 +113,8 @@
,fEnum(0)
,fList(listToUse)
,fArray(0)
-,fCount(0)
,fSize(0)
+,fCount(0)
{
fEnum = new (getMemoryManager()) RefHash2KeysTableOfEnumerator<SchemaAttDef>(listToUse, false, getMemoryManager());
fArray = (SchemaAttDef **)((getMemoryManager())->allocate( sizeof(SchemaAttDef*) << 1));
@@ -157,8 +160,8 @@
}
-XMLAttDef* SchemaAttDefList::findAttDef( const XMLCh* const attURI
- , const XMLCh* const attName)
+XMLAttDef* SchemaAttDefList::findAttDef( const XMLCh* const
+ , const XMLCh* const)
{
//need numeric URI id to locate the attribute, that's how it was stored
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Pool_InvalidId, getMemoryManager());
@@ -167,8 +170,8 @@
const XMLAttDef*
-SchemaAttDefList::findAttDef( const XMLCh* const attURI
- , const XMLCh* const attName) const
+SchemaAttDefList::findAttDef( const XMLCh* const
+ , const XMLCh* const) const
{
//need numeric URI id to locate the attribute, that's how it was stored
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Pool_InvalidId, getMemoryManager());
@@ -268,11 +271,12 @@
}
SchemaAttDefList::SchemaAttDefList(MemoryManager* const manager)
-:fEnum(0)
+: XMLAttDefList(manager)
+,fEnum(0)
,fList(0)
,fArray(0)
-,fCount(0)
,fSize(0)
+,fCount(0)
{
}
1.7 +10 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.hpp
Index: SchemaAttDefList.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDefList.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SchemaAttDefList.hpp 10 Nov 2003 21:54:51 -0000 1.6
+++ SchemaAttDefList.hpp 29 Jan 2004 11:52:31 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/11/10 21:54:51 neilg
* implementation for new stateless means of traversing attribute definition lists
*
@@ -182,6 +185,12 @@
SchemaAttDefList(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaAttDefList(const SchemaAttDefList&);
+ SchemaAttDefList& operator=(const SchemaAttDefList&);
+
void addAttDef(SchemaAttDef *toAdd);
// -----------------------------------------------------------------------
1.19 +12 -9 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp
Index: SchemaElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SchemaElementDecl.cpp 24 Dec 2003 17:42:03 -0000 1.18
+++ SchemaElementDecl.cpp 29 Jan 2004 11:52:31 -0000 1.19
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.18 2003/12/24 17:42:03 knoaman
* Misc. PSVI updates
*
@@ -189,14 +192,14 @@
, fPSVIScope(PSVIDefs::SCP_ABSENT)
, fDatatypeValidator(0)
, fEnclosingScope(Grammar::TOP_LEVEL_SCOPE)
- , fBlockSet(0)
, fFinalSet(0)
+ , fBlockSet(0)
, fMiscFlags(0)
, fDefaultValue(0)
, fComplexTypeInfo(0)
- , fXsiComplexTypeInfo(0)
- , fXsiSimpleTypeInfo(0)
, fAttDefs(0)
+ , fXsiComplexTypeInfo(0)
+ , fXsiSimpleTypeInfo(0)
, fIdentityConstraints(0)
, fAttWildCard(0)
, fSubstitutionGroupElem(0)
@@ -219,14 +222,14 @@
, fPSVIScope(PSVIDefs::SCP_ABSENT)
, fDatatypeValidator(0)
, fEnclosingScope(enclosingScope)
- , fBlockSet(0)
, fFinalSet(0)
+ , fBlockSet(0)
, fMiscFlags(0)
, fDefaultValue(0)
, fComplexTypeInfo(0)
- , fXsiComplexTypeInfo(0)
- , fXsiSimpleTypeInfo(0)
, fAttDefs(0)
+ , fXsiComplexTypeInfo(0)
+ , fXsiSimpleTypeInfo(0)
, fIdentityConstraints(0)
, fAttWildCard(0)
, fSubstitutionGroupElem(0)
@@ -248,14 +251,14 @@
, fPSVIScope(PSVIDefs::SCP_ABSENT)
, fDatatypeValidator(0)
, fEnclosingScope(enclosingScope)
- , fBlockSet(0)
, fFinalSet(0)
+ , fBlockSet(0)
, fMiscFlags(0)
, fDefaultValue(0)
, fComplexTypeInfo(0)
- , fXsiComplexTypeInfo(0)
- , fXsiSimpleTypeInfo(0)
, fAttDefs(0)
+ , fXsiComplexTypeInfo(0)
+ , fXsiSimpleTypeInfo(0)
, fIdentityConstraints(0)
, fAttWildCard(0)
, fSubstitutionGroupElem(0)
1.20 +17 -5 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp
Index: SchemaElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SchemaElementDecl.hpp 24 Dec 2003 17:42:03 -0000 1.19
+++ SchemaElementDecl.hpp 29 Jan 2004 11:52:31 -0000 1.20
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.19 2003/12/24 17:42:03 knoaman
* Misc. PSVI updates
*
@@ -382,6 +385,9 @@
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
+ /**
+ * @deprecated; not actually used
+ */
void setElemId(unsigned int elemId);
void setModelType(const SchemaElementDecl::ModelTypes toSet);
void setPSVIScope(const PSVIDefs::PSVIScope toSet);
@@ -443,6 +449,12 @@
private :
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaElementDecl(const SchemaElementDecl&);
+ SchemaElementDecl& operator=(const SchemaElementDecl&);
+
+ // -----------------------------------------------------------------------
// Private data members
//
// fModelType
@@ -518,8 +530,7 @@
int fEnclosingScope;
int fFinalSet;
int fBlockSet;
- int fMiscFlags;
- unsigned int fElemId;
+ int fMiscFlags;
XMLCh* fDefaultValue;
ComplexTypeInfo* fComplexTypeInfo;
RefHash2KeysTableOf<SchemaAttDef>* fAttDefs;
@@ -557,7 +568,7 @@
}
inline void
-SchemaElementDecl::setContentSpec(ContentSpecNode* toAdopt)
+SchemaElementDecl::setContentSpec(ContentSpecNode*)
{
//Handled by complexType
}
@@ -571,7 +582,7 @@
}
inline void
-SchemaElementDecl::setContentModel(XMLContentModel* const newModelToAdopt)
+SchemaElementDecl::setContentModel(XMLContentModel* const)
{
//Handled by complexType
}
@@ -816,7 +827,8 @@
inline void
SchemaElementDecl::setElemId(unsigned int elemId)
{
- fElemId = elemId;
+ //there is not getElemId so this is not needed. mark deprecated.
+ //fElemId = elemId;
}
inline void
1.19 +4 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.cpp
Index: SchemaGrammar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SchemaGrammar.cpp 13 Nov 2003 23:21:19 -0000 1.18
+++ SchemaGrammar.cpp 29 Jan 2004 11:52:31 -0000 1.19
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.18 2003/11/13 23:21:19 peiyongz
* don't serialize/deserialize fElemNonDecl
*
@@ -279,7 +282,7 @@
XMLElementDecl* SchemaGrammar::putElemDecl (const unsigned int uriId
, const XMLCh* const baseName
, const XMLCh* const prefixName
- , const XMLCh* const qName
+ , const XMLCh* const
, unsigned int scope
, const bool notDeclared)
{
1.15 +8 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.hpp
Index: SchemaGrammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SchemaGrammar.hpp 17 Dec 2003 00:18:40 -0000 1.14
+++ SchemaGrammar.hpp 29 Jan 2004 11:52:31 -0000 1.15
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.14 2003/12/17 00:18:40 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -365,6 +368,11 @@
DECL_XSERIALIZABLE(SchemaGrammar)
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaGrammar(const SchemaGrammar&);
+ SchemaGrammar& operator=(const SchemaGrammar&);
// -----------------------------------------------------------------------
// Helper methods
1.16 +7 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.hpp
Index: SchemaInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SchemaInfo.hpp 11 Dec 2003 19:26:27 -0000 1.15
+++ SchemaInfo.hpp 29 Jan 2004 11:52:31 -0000 1.16
@@ -171,6 +171,12 @@
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaInfo(const SchemaInfo&);
+ SchemaInfo& operator=(const SchemaInfo&);
+
+ // -----------------------------------------------------------------------
// Private helper methods
// -----------------------------------------------------------------------
void clearTopLevelComponents();
1.6 +6 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.hpp
Index: SchemaSymbols.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SchemaSymbols.hpp 13 Jan 2003 20:16:51 -0000 1.5
+++ SchemaSymbols.hpp 29 Jan 2004 11:52:31 -0000 1.6
@@ -272,6 +272,11 @@
XSD_FIXED = 4
};
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaSymbols();
};
XERCES_CPP_NAMESPACE_END
1.52 +9 -6 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp
Index: SchemaValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SchemaValidator.cpp 30 Dec 2003 06:01:20 -0000 1.51
+++ SchemaValidator.cpp 29 Jan 2004 11:52:31 -0000 1.52
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.52 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.51 2003/12/30 06:01:20 neilg
* fix segfault when validation of a union type fails
*
@@ -327,15 +330,15 @@
XMLValidator(errReporter)
, fMemoryManager(manager)
- , fGrammarResolver(0)
, fSchemaGrammar(0)
- , fTrailing(false)
- , fSeenId(false)
+ , fGrammarResolver(0)
, fXsiType(0)
+ , fNil(false)
, fCurrentDatatypeValidator(0)
, fNotationBuf(0)
, fDatatypeBuffer(1023, manager)
- , fNil(false)
+ , fTrailing(false)
+ , fSeenId(false)
, fTypeStack(0)
, fMostRecentAttrValidator(0)
, fErrorOccurred(false)
@@ -996,7 +999,7 @@
((SchemaElementDecl *)(elemDef))->setValidity(PSVIDefs::INVALID);
}
-void SchemaValidator::preContentValidation(bool reuseGrammar,
+void SchemaValidator::preContentValidation(bool,
bool validateDefAttr)
{
// Lets go through all the grammar in the GrammarResolver
1.25 +10 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.hpp
Index: SchemaValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SchemaValidator.hpp 3 Dec 2003 20:00:27 -0000 1.24
+++ SchemaValidator.hpp 29 Jan 2004 11:52:31 -0000 1.25
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.25 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.24 2003/12/03 20:00:27 neilg
* PSVI fix: cannot allow validator to reset its element content buffer before exposing it to the application
*
@@ -282,6 +285,12 @@
const XMLCh* getNormalizedValue() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaValidator(const SchemaValidator&);
+ SchemaValidator& operator=(const SchemaValidator&);
+
// -----------------------------------------------------------------------
// Element Consitency Checking methods
// -----------------------------------------------------------------------
1.4 +5 -6 xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
Index: SubstitutionGroupComparator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SubstitutionGroupComparator.hpp 16 May 2003 03:15:51 -0000 1.3
+++ SubstitutionGroupComparator.hpp 29 Jan 2004 11:52:31 -0000 1.4
@@ -125,14 +125,14 @@
*/
bool isAllowedByWildcard(SchemaGrammar* const pGrammar, QName* const element, unsigned int wuri, bool wother);
-protected:
-
private:
// -----------------------------------------------------------------------
- // Unimplemented Ctor
+ // Unimplemented constructors and operators
// -----------------------------------------------------------------------
SubstitutionGroupComparator();
-
+ SubstitutionGroupComparator(const SubstitutionGroupComparator&);
+ SubstitutionGroupComparator& operator=(const SubstitutionGroupComparator&);
+
// -----------------------------------------------------------------------
// Private data members
//
@@ -140,7 +140,6 @@
// -----------------------------------------------------------------------
GrammarResolver *fGrammarResolver;
XMLStringPool *fStringPool;
-
};
1.109 +21 -29 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.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- TraverseSchema.cpp 15 Jan 2004 18:15:24 -0000 1.108
+++ TraverseSchema.cpp 29 Jan 2004 11:52:31 -0000 1.109
@@ -225,7 +225,8 @@
, fComplexTypeRegistry(0)
, fGroupRegistry(0)
, fAttGroupRegistry(0)
- , fSchemaInfoList(0)
+ , fIC_ElementsNS(0)
+ , fPreprocessedNodes(0)
, fSchemaInfo(0)
, fCurrentGroupInfo(0)
, fCurrentAttGroupInfo(0)
@@ -237,15 +238,14 @@
, fDeclStack(0)
, fGlobalDeclarations(0)
, fNonXSAttList(0)
+ , fIC_NodeListNS(0)
+ , fIC_NamespaceDepthNS(0)
, fNotationRegistry(0)
, fRedefineComponents(0)
, fIdentityConstraintNames(0)
- , fValidSubstitutionGroups(0)
- , fIC_NodeListNS(0)
- , fIC_ElementsNS(0)
- , fIC_NamespaceDepthNS(0)
- , fParser(0)
- , fPreprocessedNodes(0)
+ , fValidSubstitutionGroups(0)
+ , fSchemaInfoList(0)
+ , fParser(0)
, fLocator(0)
, fMemoryManager(manager)
, fGrammarPoolMemoryManager(fGrammarResolver->getGrammarPoolMemoryManager())
@@ -1353,7 +1353,7 @@
if (child == 0) {
// EMPTY complexType with complexContent
- processComplexContent(elem, name, child, typeInfo, 0,0,0, isMixed);
+ processComplexContent(elem, name, child, typeInfo, 0, isMixed);
}
else {
@@ -1384,7 +1384,7 @@
// We must have ....
// GROUP, ALL, SEQUENCE or CHOICE, followed by optional attributes
// Note that it's possible that only attributes are specified.
- processComplexContent(elem, name, child, typeInfo, 0, 0, 0, isMixed);
+ processComplexContent(elem, name, child, typeInfo, 0, isMixed);
}
}
}
@@ -2607,7 +2607,7 @@
const XMLCh* anotherSchemaURI = checkTypeFromAnotherSchema(elem, typeStr);
// get complex type info
- typeInfo = getElementComplexTypeInfo(elem, typeStr, noErrorFound, anotherSchemaURI);
+ typeInfo = getElementComplexTypeInfo(elem, typeStr, anotherSchemaURI);
// get simple type validtor - if not a complex type
if (typeInfo)
@@ -3160,7 +3160,6 @@
reportSchemaError(contentElem, XMLUni::fgXMLErrDomain, XMLErrs::SimpleTypeContentError);
}
- int size = 1;
const XMLCh* baseTypeName = getElementAttValue(contentElem, SchemaSymbols::fgATT_MEMBERTYPES);
DatatypeValidator* baseValidator = 0;
RefVectorOf<DatatypeValidator>* validators = new (fGrammarPoolMemoryManager) RefVectorOf<DatatypeValidator>(4, false, fGrammarPoolMemoryManager);
@@ -3649,7 +3648,7 @@
// -----------------------------------------------------------------------
// Process attributes if any
// -----------------------------------------------------------------------
- processAttributes(simpleContent, content, baseName, localPart, uri, typeInfo);
+ processAttributes(simpleContent, content, typeInfo);
if (XUtil::getNextSiblingElement(simpleContent) != 0) {
reportSchemaError(simpleContent, XMLUni::fgXMLErrDomain, XMLErrs::InvalidChildInSimpleContent);
@@ -3806,8 +3805,8 @@
janAnnot->get()->setNext(fAnnotation);
}
- processComplexContent(complexContent, typeName, content, typeInfo, baseName, localPart,
- uri, mixedContent, isBaseAnyType);
+ processComplexContent(complexContent, typeName, content, typeInfo, localPart,
+ mixedContent, isBaseAnyType);
if (XUtil::getNextSiblingElement(complexContent) != 0) {
reportSchemaError(complexContent, XMLUni::fgXMLErrDomain, XMLErrs::InvalidChildInComplexContent);
@@ -5120,8 +5119,7 @@
ComplexTypeInfo*
TraverseSchema::getElementComplexTypeInfo(const DOMElement* const elem,
- const XMLCh* const typeStr,
- bool& noErrorDetected,
+ const XMLCh* const typeStr,
const XMLCh* const otherSchemaURI)
{
const XMLCh* localPart = getLocalPart(typeStr);
@@ -5784,10 +5782,8 @@
void TraverseSchema::processComplexContent(const DOMElement* const ctElem,
const XMLCh* const typeName,
const DOMElement* const childElem,
- ComplexTypeInfo* const typeInfo,
- const XMLCh* const baseRawName,
- const XMLCh* const baseLocalPart,
- const XMLCh* const baseURI,
+ ComplexTypeInfo* const typeInfo,
+ const XMLCh* const baseLocalPart,
const bool isMixed,
const bool isBaseAnyType) {
@@ -6047,11 +6043,11 @@
attrNode->getLocalName());
}
else {
- processAttributes(ctElem, attrNode, baseRawName, baseLocalPart, baseURI, typeInfo, isBaseAnyType);
+ processAttributes(ctElem, attrNode, typeInfo, isBaseAnyType);
}
}
else if (baseTypeInfo != 0 || isBaseAnyType) {
- processAttributes(ctElem, 0, baseRawName, baseLocalPart, baseURI, typeInfo, isBaseAnyType);
+ processAttributes(ctElem, 0, typeInfo, isBaseAnyType);
}
}
@@ -6226,10 +6222,7 @@
void TraverseSchema::processAttributes(const DOMElement* const elem,
- const DOMElement* const attElem,
- const XMLCh* const baseRawName,
- const XMLCh* const baseLocalPart,
- const XMLCh* const baseURI,
+ const DOMElement* const attElem,
ComplexTypeInfo* const typeInfo,
const bool isBaseAnyType) {
@@ -8494,8 +8487,7 @@
}
}
- XMLCh* subsElemBaseName = subsElemDecl->getBaseName();
- int elemURI = elemDecl->getURI();
+ XMLCh* subsElemBaseName = subsElemDecl->getBaseName();
int subsElemURI = subsElemDecl->getURI();
ValueVectorOf<SchemaElementDecl*>* subsElements =
fValidSubstitutionGroups->get(subsElemBaseName, subsElemURI);
1.33 +5 -11 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.hpp
Index: TraverseSchema.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.hpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TraverseSchema.hpp 17 Dec 2003 00:18:40 -0000 1.32
+++ TraverseSchema.hpp 29 Jan 2004 11:52:31 -0000 1.33
@@ -426,8 +426,7 @@
* the type is a complex type
*/
ComplexTypeInfo* getElementComplexTypeInfo(const DOMElement* const elem,
- const XMLCh* const typeStr,
- bool& noErrorDetected,
+ const XMLCh* const typeStr,
const XMLCh* const otherSchemaURI);
/**
@@ -482,10 +481,8 @@
void processComplexContent(const DOMElement* const elem,
const XMLCh* const typeName,
const DOMElement* const childElem,
- ComplexTypeInfo* const typeInfo,
- const XMLCh* const baseRawName,
- const XMLCh* const baseLocalPart,
- const XMLCh* const baseURI,
+ ComplexTypeInfo* const typeInfo,
+ const XMLCh* const baseLocalPart,
const bool isMixed,
const bool isBaseAnyType = false);
@@ -524,10 +521,7 @@
* Process attributes of a complex type
*/
void processAttributes(const DOMElement* const elem,
- const DOMElement* const attElem,
- const XMLCh* const baseRawName,
- const XMLCh* const baseLocalPart,
- const XMLCh* const baseURI,
+ const DOMElement* const attElem,
ComplexTypeInfo* const typeInfo,
const bool isBaseAnyType = false);
1.12 +11 -15 xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.cpp
Index: XSDDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSDDOMParser.cpp 22 Oct 2003 20:33:42 -0000 1.11
+++ XSDDOMParser.cpp 29 Jan 2004 11:52:31 -0000 1.12
@@ -87,9 +87,10 @@
, fInnerAnnotationDepth(-1)
, fDepth(-1)
, fUserErrorReporter(0)
- , fUserEntityHandler(0)
- , fAnnotationBuf(1023, manager)
+ , fUserEntityHandler(0)
, fURIs(0)
+ , fAnnotationBuf(1023, manager)
+
{
fURIs = new (manager) ValueVectorOf<unsigned int>(16, manager);
fXSDErrorReporter.setErrorReporter(this);
@@ -135,8 +136,7 @@
for (unsigned int i=0; i < attrCount; i++) {
const XMLAttr* oneAttrib = attrList.elementAt(i);
- const XMLCh* attrValue = oneAttrib->getValue();
- unsigned int attrURIId = oneAttrib->getURIId();
+ const XMLCh* attrValue = oneAttrib->getValue();
if (XMLString::equals(oneAttrib->getName(), XMLUni::fgXMLNSString))
fURIs->addElement(fScanner->getPrefixId(XMLUni::fgZeroLenString));
@@ -413,9 +413,9 @@
void XSDDOMParser::endElement( const XMLElementDecl& elemDecl
- , const unsigned int urlId
- , const bool isRoot
- , const XMLCh* const elemPrefix)
+ , const unsigned int
+ , const bool
+ , const XMLCh* const)
{
if(fAnnotationDepth > -1)
{
@@ -507,21 +507,17 @@
}
}
-void XSDDOMParser::startEntityReference(const XMLEntityDecl& entDecl)
+void XSDDOMParser::startEntityReference(const XMLEntityDecl&)
{
- int i=0;
- i++;
}
-void XSDDOMParser::endEntityReference(const XMLEntityDecl& entDecl)
+void XSDDOMParser::endEntityReference(const XMLEntityDecl&)
{
- int j=0;
- j++;
}
void XSDDOMParser::ignorableWhitespace( const XMLCh* const chars
, const unsigned int length
- , const bool cdataSection)
+ , const bool)
{
// Ignore chars before the root element
if (!fWithinElement || !fIncludeIgnorableWhitespace)
1.10 +7 -1 xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.hpp
Index: XSDDOMParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSDDOMParser.hpp 22 Oct 2003 20:33:42 -0000 1.9
+++ XSDDOMParser.hpp 29 Jan 2004 11:52:31 -0000 1.10
@@ -315,6 +315,12 @@
private:
// -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XSDDOMParser(const XSDDOMParser&);
+ XSDDOMParser& operator=(const XSDDOMParser&);
+
+ // -----------------------------------------------------------------------
// Private Helper methods
// -----------------------------------------------------------------------
void startAnnotation
1.5 +4 -2 xml-xerces/c/src/xercesc/validators/schema/XUtil.hpp
Index: XUtil.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XUtil.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XUtil.hpp 4 Nov 2002 14:49:42 -0000 1.4
+++ XUtil.hpp 29 Jan 2004 11:52:31 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:52:31 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2002/11/04 14:49:42 tng
* C++ Namespace Support.
*
@@ -116,7 +119,7 @@
, const XMLCh* const uriStr
, unsigned int length);
-protected:
+private:
// -----------------------------------------------------------------------
// Constructors and Destructor
// -----------------------------------------------------------------------
@@ -124,7 +127,6 @@
// This class cannot be instantiated.
XUtil() {};
~XUtil() {};
-
};
XERCES_CPP_NAMESPACE_END
1.7 +6 -3 xml-xerces/c/src/xercesc/validators/schema/identity/IC_Field.cpp
Index: IC_Field.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IC_Field.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IC_Field.cpp 16 Dec 2003 18:41:15 -0000 1.6
+++ IC_Field.cpp 29 Jan 2004 11:52:32 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:52:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/16 18:41:15 knoaman
* Make IC_Field stateless
*
@@ -102,8 +105,8 @@
FieldActivator* const fieldActivator,
MemoryManager* const manager)
: XPathMatcher(xpath, (IdentityConstraint*) 0, manager)
- , fField(aField)
, fValueStore(valueStore)
+ , fField(aField)
, fFieldActivator(fieldActivator)
{
}
@@ -159,8 +162,8 @@
// ---------------------------------------------------------------------------
// IC_Field: Factory methods
// ---------------------------------------------------------------------------
-XPathMatcher* IC_Field::createMatcher(ValueStore* const valueStore,
- MemoryManager* const manager) {
+XPathMatcher* IC_Field::createMatcher(ValueStore* const,
+ MemoryManager* const) {
return 0;
}
1.10 +5 -6 xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
Index: IdentityConstraint.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IdentityConstraint.cpp 14 Nov 2003 22:35:09 -0000 1.9
+++ IdentityConstraint.cpp 29 Jan 2004 11:52:32 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:52:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/11/14 22:35:09 neilg
* changes in support of second phase of XSModel implementation; thanks to David Cargill
*
@@ -122,6 +125,7 @@
, fSelector(0)
, fFields(0)
, fMemoryManager(manager)
+ , fNamespaceURI(-1)
{
try {
fIdentityConstraintName = XMLString::replicate(identityConstraintName, fMemoryManager);
@@ -269,24 +273,19 @@
case UNIQUE:
IC_Unique* ic_unique;
serEng>>ic_unique;
- return ic_unique;
- break;
+ return ic_unique;
case KEY:
IC_Key* ic_key;
serEng>>ic_key;
return ic_key;
- break;
case KEYREF:
IC_KeyRef* ic_keyref;
serEng>>ic_keyref;
return ic_keyref;
- break;
case UNKNOWN:
return 0;
- break;
default: //we treat this same as UnKnown
return 0;
- break;
}
}
1.10 +6 -3 xml-xerces/c/src/xercesc/validators/schema/identity/ValueStore.cpp
Index: ValueStore.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/ValueStore.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ValueStore.cpp 17 Dec 2003 00:18:41 -0000 1.9
+++ ValueStore.cpp 29 Jan 2004 11:52:32 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:52:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/17 00:18:41 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -135,9 +138,9 @@
// ---------------------------------------------------------------------------
// ValueStore: Helper methods
// ---------------------------------------------------------------------------
-void ValueStore::addValue(IC_Field* const field,
- DatatypeValidator* const dv,
- const XMLCh* const value) {
+void ValueStore::addValue(IC_Field* const,
+ DatatypeValidator* const,
+ const XMLCh* const) {
}
1.13 +6 -5 xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp
Index: XercesXPath.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XercesXPath.cpp 17 Dec 2003 00:18:41 -0000 1.12
+++ XercesXPath.cpp 29 Jan 2004 11:52:32 -0000 1.13
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2004/01/29 11:52:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/17 00:18:41 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -191,7 +194,7 @@
}
}
-XercesNodeTest::XercesNodeTest(MemoryManager* const manager)
+XercesNodeTest::XercesNodeTest(MemoryManager* const)
:fType(UNKNOWN)
,fName(0)
{
@@ -298,7 +301,7 @@
}
}
-XercesStep::XercesStep(MemoryManager* const manager)
+XercesStep::XercesStep(MemoryManager* const)
:fAxisType(UNKNOWN)
,fNodeTest(0)
{
@@ -359,7 +362,7 @@
}
}
-XercesLocationPath::XercesLocationPath(MemoryManager* const manager)
+XercesLocationPath::XercesLocationPath(MemoryManager* const)
:fSteps(0)
{
}
@@ -1417,8 +1420,6 @@
if (ch == chPeriod) {
if (++currentOffset < endOffset) {
-
- int start = currentOffset;
ch = data[currentOffset];
1.11 +6 -3 xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.cpp
Index: XPathMatcher.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathMatcher.cpp 17 Dec 2003 00:18:41 -0000 1.10
+++ XPathMatcher.cpp 29 Jan 2004 11:52:32 -0000 1.11
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/29 11:52:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/12/17 00:18:41 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -409,9 +412,9 @@
return 0;
}
-void XPathMatcher::matched(const XMLCh* const content,
- DatatypeValidator* const dv,
- const bool isNil) {
+void XPathMatcher::matched(const XMLCh* const,
+ DatatypeValidator* const,
+ const bool) {
return;
}
1.7 +6 -1 xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.hpp
Index: XPathMatcher.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XPathMatcher.hpp 16 May 2003 21:43:22 -0000 1.6
+++ XPathMatcher.hpp 29 Jan 2004 11:52:32 -0000 1.7
@@ -145,6 +145,11 @@
DatatypeValidator* const dv, const bool isNil);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XPathMatcher(const XPathMatcher&);
+ XPathMatcher& operator=(const XPathMatcher&);
// -----------------------------------------------------------------------
// Helper methods
1.4 +6 -1 xml-xerces/c/src/xercesc/validators/schema/identity/XPathSymbols.hpp
Index: XPathSymbols.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathSymbols.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPathSymbols.hpp 17 Oct 2003 19:34:47 -0000 1.3
+++ XPathSymbols.hpp 29 Jan 2004 11:52:32 -0000 1.4
@@ -97,6 +97,11 @@
static const XMLCh fgSYMBOL_PRECEDING_SIBLING[];
static const XMLCh fgSYMBOL_SELF[];
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XPathSymbols();
};
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org