amassari 2005/01/07 06:38:24
Modified: c/src/xercesc/dom/deprecated AttrImpl.cpp
CharacterDataImpl.cpp ChildNode.cpp
DOM_DOMImplementation.cpp DOM_NamedNodeMap.cpp
DOM_Node.cpp DOM_NodeIterator.cpp DOM_NodeList.cpp
DOM_Range.cpp DOM_TreeWalker.cpp DOMParser.cpp
DOMString.cpp ElementDefinitionImpl.cpp
NodeImpl.cpp NodeIteratorImpl.cpp NotationImpl.cpp
ProcessingInstructionImpl.cpp RangeImpl.cpp
TextImpl.cpp TreeWalkerImpl.cpp XMLDeclImpl.cpp
Log:
Removed warnings
Revision Changes Path
1.10 +2 -2 xml-xerces/c/src/xercesc/dom/deprecated/AttrImpl.cpp
Index: AttrImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/AttrImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AttrImpl.cpp 8 Sep 2004 13:55:42 -0000 1.9
+++ AttrImpl.cpp 7 Jan 2005 14:38:21 -0000 1.10
@@ -61,7 +61,7 @@
value.child = null;
};
-AttrImpl::AttrImpl(const AttrImpl &other, bool deep)
+AttrImpl::AttrImpl(const AttrImpl &other, bool /*deep*/)
: NodeImpl(other)
{
name = other.name.clone();
1.5 +2 -2
xml-xerces/c/src/xercesc/dom/deprecated/CharacterDataImpl.cpp
Index: CharacterDataImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/CharacterDataImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CharacterDataImpl.cpp 8 Sep 2004 13:55:42 -0000 1.4
+++ CharacterDataImpl.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -33,7 +33,7 @@
this->data = dat.clone();
};
-CharacterDataImpl::CharacterDataImpl(const CharacterDataImpl &other, bool
deep)
+CharacterDataImpl::CharacterDataImpl(const CharacterDataImpl &other, bool
/*deep*/)
: ChildNode(other)
{
data = other.data.clone();
1.5 +7 -7 xml-xerces/c/src/xercesc/dom/deprecated/ChildNode.cpp
Index: ChildNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/ChildNode.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChildNode.cpp 8 Sep 2004 13:55:42 -0000 1.4
+++ ChildNode.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -30,7 +30,7 @@
{
this->previousSibling = null;
this->nextSibling = null;
-};
+}
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -41,27 +41,27 @@
this->previousSibling = null;
this->nextSibling = null;
isFirstChild(false);
-};
+}
ChildNode::~ChildNode() {
-};
+}
NodeImpl * ChildNode::getNextSibling() {
return nextSibling;
-};
+}
NodeImpl * ChildNode::getParentNode()
{
// if we have an owner, ownerNode is our parent, otherwise it's
// our ownerDocument and we don't have a parent
return isOwned() ? ownerNode : null;
-};
+}
NodeImpl * ChildNode::getPreviousSibling() {
// if we are the firstChild, previousSibling actually refers to our
// parent's lastChild, but we hide that
return isFirstChild() ? null : previousSibling;
-};
+}
XERCES_CPP_NAMESPACE_END
1.7 +8 -8
xml-xerces/c/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp
Index: DOM_DOMImplementation.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_DOMImplementation.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DOM_DOMImplementation.cpp 8 Sep 2004 13:55:42 -0000 1.6
+++ DOM_DOMImplementation.cpp 7 Jan 2005 14:38:22 -0000 1.7
@@ -66,24 +66,24 @@
// created with the default constructor.
//
DOM_DOMImplementation::DOM_DOMImplementation() {
-};
+}
-DOM_DOMImplementation::DOM_DOMImplementation(const DOM_DOMImplementation &
other)
+DOM_DOMImplementation::DOM_DOMImplementation(const DOM_DOMImplementation &
/*other*/)
{
-};
+}
DOM_DOMImplementation::~DOM_DOMImplementation()
{
-};
+}
-DOM_DOMImplementation & DOM_DOMImplementation::operator = (const
DOM_DOMImplementation & other)
+DOM_DOMImplementation & DOM_DOMImplementation::operator = (const
DOM_DOMImplementation & /*other*/)
{
return *this;
-};
+}
// -----------------------------------------------------------------------
// Reset the singleton DOM_DOMImplementation
@@ -118,7 +118,7 @@
}
return *gDomimp;
-};
+}
bool DOM_DOMImplementation::hasFeature(const DOMString &feature, const
DOMString &version)
{
1.5 +19 -19
xml-xerces/c/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp
Index: DOM_NamedNodeMap.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_NamedNodeMap.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOM_NamedNodeMap.cpp 8 Sep 2004 13:55:42 -0000 1.4
+++ DOM_NamedNodeMap.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -35,7 +35,7 @@
{
fImpl = 0;
flagElem = NNM_OTHER;
-};
+}
DOM_NamedNodeMap::DOM_NamedNodeMap(const DOM_NamedNodeMap & other)
@@ -44,7 +44,7 @@
this->flagElem = other.flagElem;
(other.flagElem == NNM_ELEMENT) ? NodeImpl::addRef((NodeImpl *)fImpl) :
NamedNodeMapImpl::addRef((NamedNodeMapImpl *)fImpl);
-};
+}
DOM_NamedNodeMap::DOM_NamedNodeMap(NamedNodeMapImpl *impl)
@@ -53,7 +53,7 @@
flagElem = NNM_OTHER;
if (impl != null)
NamedNodeMapImpl::addRef((NamedNodeMapImpl *)fImpl);
-};
+}
DOM_NamedNodeMap::DOM_NamedNodeMap(NodeImpl *impl)
{
@@ -67,30 +67,30 @@
{
(flagElem == NNM_OTHER) ? NamedNodeMapImpl::removeRef((NamedNodeMapImpl
*)fImpl) :
NodeImpl::removeRef((NodeImpl *)fImpl);
-};
+}
bool DOM_NamedNodeMap::operator == (const DOM_NamedNodeMap &other) const
{
return this->fImpl == other.fImpl;
-};
+}
bool DOM_NamedNodeMap::operator != (const DOM_NamedNodeMap &other) const
{
return this->fImpl != other.fImpl;
-};
+}
-bool DOM_NamedNodeMap::operator == (const DOM_NullPtr *p) const
+bool DOM_NamedNodeMap::operator == (const DOM_NullPtr * /*p*/) const
{
return this->fImpl == 0;
-};
+}
-bool DOM_NamedNodeMap::operator != (const DOM_NullPtr *p) const
+bool DOM_NamedNodeMap::operator != (const DOM_NullPtr * /*p*/) const
{
return this->fImpl != 0;
-};
+}
DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NamedNodeMap &
other)
@@ -106,52 +106,52 @@
(flagElem == NNM_OTHER) ? NamedNodeMapImpl::addRef((NamedNodeMapImpl
*)fImpl) : NodeImpl::addRef((NodeImpl *)fImpl);
}
return *this;
-};
+}
-DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NullPtr *other)
+DOM_NamedNodeMap & DOM_NamedNodeMap::operator = (const DOM_NullPtr *
/*other*/)
{
(flagElem == NNM_OTHER) ? NamedNodeMapImpl::removeRef((NamedNodeMapImpl
*)fImpl) : NodeImpl::removeRef((NodeImpl *)fImpl);
this->fImpl = 0;
this->flagElem = NNM_OTHER;
return *this;
-};
+}
DOM_Node DOM_NamedNodeMap::getNamedItem(const DOMString &name) const
{
return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl
*)fImpl)->getNamedItem(name)) :
DOM_Node(((ElementImpl
*)fImpl)->NNM_getNamedItem(name));
-};
+}
DOM_Node DOM_NamedNodeMap::setNamedItem(DOM_Node arg)
{
return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl
*)fImpl)->setNamedItem(arg.fImpl)) :
DOM_Node(((ElementImpl
*)fImpl)->NNM_setNamedItem(arg.fImpl));
-};
+}
DOM_Node DOM_NamedNodeMap::removeNamedItem(const DOMString &name)
{
return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl
*)fImpl)->removeNamedItem(name)) :
DOM_Node(((ElementImpl
*)fImpl)->NNM_removeNamedItem(name));
-};
+}
DOM_Node DOM_NamedNodeMap::item(unsigned int index) const
{
return (flagElem == NNM_OTHER) ? DOM_Node(((NamedNodeMapImpl
*)fImpl)->item(index)) :
DOM_Node(((ElementImpl
*)fImpl)->NNM_item(index));
-};
+}
unsigned int DOM_NamedNodeMap::getLength() const
{
return (flagElem == NNM_OTHER) ? ((NamedNodeMapImpl
*)fImpl)->getLength() :
((ElementImpl
*)fImpl)->NNM_getLength();
-};
+}
//Introduced in DOM Level 2
1.5 +34 -34 xml-xerces/c/src/xercesc/dom/deprecated/DOM_Node.cpp
Index: DOM_Node.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_Node.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOM_Node.cpp 8 Sep 2004 13:55:42 -0000 1.4
+++ DOM_Node.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -32,21 +32,21 @@
DOM_Node::DOM_Node()
{
fImpl = null;
-};
+}
DOM_Node::DOM_Node(NodeImpl *impl)
{
fImpl = impl;
RefCountedImpl::addRef(fImpl);
-};
+}
DOM_Node::DOM_Node(const DOM_Node &other)
{
this->fImpl = other.fImpl;
RefCountedImpl::addRef(fImpl);
-};
+}
DOM_Node & DOM_Node::operator = (const DOM_Node &other)
@@ -58,15 +58,15 @@
RefCountedImpl::addRef(this->fImpl);
}
return *this;
-};
+}
-DOM_Node & DOM_Node::operator = (const DOM_NullPtr *other)
+DOM_Node & DOM_Node::operator = (const DOM_NullPtr * /*other*/)
{
RefCountedImpl::removeRef(this->fImpl);
this->fImpl = 0;
return *this;
-};
+}
@@ -74,7 +74,7 @@
{
RefCountedImpl::removeRef (this->fImpl);
fImpl = 0;
-};
+}
//
// Comparison operators. Equivalent of Java object reference ==
@@ -83,24 +83,24 @@
bool DOM_Node::operator != (const DOM_Node & other) const
{
return this->fImpl != other.fImpl;
-};
+}
bool DOM_Node::operator == (const DOM_Node & other) const
{
return this->fImpl == other.fImpl;
-};
+}
-bool DOM_Node::operator != (const DOM_NullPtr * other) const
+bool DOM_Node::operator != (const DOM_NullPtr * /*other*/) const
{
return this->fImpl != 0;
-};
+}
-bool DOM_Node::operator == (const DOM_NullPtr * other) const
+bool DOM_Node::operator == (const DOM_NullPtr * /*other*/) const
{
return this->fImpl == 0;
-};
+}
@@ -108,67 +108,67 @@
DOM_Node DOM_Node::appendChild(const DOM_Node &newChild)
{
return DOM_Node(fImpl->appendChild(newChild.fImpl));
-};
+}
DOM_Node DOM_Node::cloneNode(bool deep) const
{
return DOM_Node(fImpl->cloneNode(deep));
-};
+}
DOMString DOM_Node::getNodeName() const
{
return fImpl->getNodeName().clone();
-};
+}
DOMString DOM_Node::getNodeValue() const
{
return fImpl->getNodeValue().clone();
-};
+}
short DOM_Node::getNodeType() const
{
return fImpl->getNodeType();
-};
+}
DOM_Node DOM_Node::getParentNode() const
{
return DOM_Node(fImpl->getParentNode());
-};
+}
DOM_NodeList DOM_Node::getChildNodes() const
{
return DOM_NodeList(fImpl);
-};
+}
DOM_Node DOM_Node::getFirstChild() const
{
return DOM_Node(fImpl->getFirstChild());
-};
+}
DOM_Node DOM_Node::getLastChild() const
{
return DOM_Node(fImpl->getLastChild());
-};
+}
DOM_Node DOM_Node::getPreviousSibling() const
{
return DOM_Node(fImpl->getPreviousSibling());
-};
+}
DOM_Node DOM_Node::getNextSibling() const
{
return DOM_Node(fImpl->getNextSibling());
-};
+}
void *DOM_Node::getUserData() const
@@ -182,46 +182,46 @@
return (fImpl->getAttributes() == null) ?
DOM_NamedNodeMap(fImpl) : DOM_NamedNodeMap(fImpl->getAttributes());
else
return DOM_NamedNodeMap();
-};
+}
DOM_Document DOM_Node::getOwnerDocument() const
{
return fImpl->getOwnerDocument();
-};
+}
bool DOM_Node::hasChildNodes() const
{
return fImpl->hasChildNodes();
-};
+}
DOM_Node DOM_Node::insertBefore(const DOM_Node &newChild, const
DOM_Node &refChild){
return DOM_Node(fImpl->insertBefore(newChild.fImpl, refChild.fImpl));
-};
+}
bool DOM_Node::isNull() const
{
return fImpl == null;
-};
+}
DOM_Node DOM_Node::replaceChild(const DOM_Node &newChild, const
DOM_Node &oldChild){
return DOM_Node(fImpl->replaceChild(newChild.fImpl, oldChild.fImpl));
-};
+}
DOM_Node DOM_Node::removeChild(const DOM_Node &oldChild){
return DOM_Node(fImpl->removeChild(oldChild.fImpl));
-};
+}
void DOM_Node::setNodeValue(const DOMString &nodeValue)
{
fImpl->setNodeValue(nodeValue);
-};
+}
void DOM_Node::setUserData(void *p)
@@ -235,7 +235,7 @@
void DOM_Node::normalize()
{
fImpl->normalize();
-};
+}
bool DOM_Node::isSupported(const DOMString &feature,
1.5 +4 -4
xml-xerces/c/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp
Index: DOM_NodeIterator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_NodeIterator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOM_NodeIterator.cpp 8 Sep 2004 13:55:42 -0000 1.4
+++ DOM_NodeIterator.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -58,7 +58,7 @@
};
-DOM_NodeIterator & DOM_NodeIterator::operator = (const DOM_NullPtr *other)
+DOM_NodeIterator & DOM_NodeIterator::operator = (const DOM_NullPtr *
/*other*/)
{
RefCountedImpl::removeRef(this->fImpl);
this->fImpl = 0;
@@ -88,13 +88,13 @@
return this->fImpl == other.fImpl;
};
-bool DOM_NodeIterator::operator != (const DOM_NullPtr * other) const
+bool DOM_NodeIterator::operator != (const DOM_NullPtr * /*other*/)
const
{
return this->fImpl != 0;
};
-bool DOM_NodeIterator::operator == (const DOM_NullPtr * other) const
+bool DOM_NodeIterator::operator == (const DOM_NullPtr * /*other*/)
const
{
return this->fImpl == 0;
}
1.5 +16 -16 xml-xerces/c/src/xercesc/dom/deprecated/DOM_NodeList.cpp
Index: DOM_NodeList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_NodeList.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOM_NodeList.cpp 8 Sep 2004 13:55:42 -0000 1.4
+++ DOM_NodeList.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -29,21 +29,21 @@
DOM_NodeList::DOM_NodeList()
{
fImpl = 0;
-};
+}
DOM_NodeList::DOM_NodeList(NodeListImpl *impl)
{
fImpl = impl;
RefCountedImpl::addRef(fImpl);
-};
+}
DOM_NodeList::DOM_NodeList(const DOM_NodeList &other)
{
fImpl = other.fImpl;
RefCountedImpl::addRef(fImpl);
-};
+}
DOM_NodeList & DOM_NodeList::operator = (const DOM_NodeList &other)
@@ -55,46 +55,46 @@
RefCountedImpl::addRef(this->fImpl);
}
return *this;
-};
+}
-DOM_NodeList & DOM_NodeList::operator = (const DOM_NullPtr *other)
+DOM_NodeList & DOM_NodeList::operator = (const DOM_NullPtr * /*other*/)
{
RefCountedImpl::removeRef(this->fImpl);
this->fImpl = 0;
return *this;
-};
+}
DOM_NodeList::~DOM_NodeList()
{
RefCountedImpl::removeRef(this->fImpl);
fImpl = 0;
-};
+}
bool DOM_NodeList::operator == (const DOM_NodeList &other) const
{
return this->fImpl == other.fImpl;
-};
+}
bool DOM_NodeList::operator != (const DOM_NodeList &other) const
{
return this->fImpl != other.fImpl;
-};
+}
-bool DOM_NodeList::operator == (const DOM_NullPtr *nullPtr) const
+bool DOM_NodeList::operator == (const DOM_NullPtr * /*nullPtr*/) const
{
return this->fImpl == 0;
-};
+}
-bool DOM_NodeList::operator != (const DOM_NullPtr *nullPtr) const
+bool DOM_NodeList::operator != (const DOM_NullPtr * /*nullPtr*/) const
{
return this->fImpl != 0;
-};
+}
@@ -102,13 +102,13 @@
DOM_Node DOM_NodeList::item(unsigned int index) const
{
return DOM_Node(fImpl->item(index));
-};
+}
unsigned int DOM_NodeList::getLength() const
{
return fImpl->getLength();
-};
+}
XERCES_CPP_NAMESPACE_END
1.5 +4 -4 xml-xerces/c/src/xercesc/dom/deprecated/DOM_Range.cpp
Index: DOM_Range.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_Range.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOM_Range.cpp 8 Sep 2004 13:55:43 -0000 1.4
+++ DOM_Range.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -62,7 +62,7 @@
};
-DOM_Range & DOM_Range::operator = (const DOM_NullPtr *other)
+DOM_Range & DOM_Range::operator = (const DOM_NullPtr * /*other*/)
{
RefCountedImpl::removeRef(this->fImpl);
this->fImpl = 0;
@@ -80,13 +80,13 @@
return this->fImpl == other.fImpl;
};
-bool DOM_Range::operator != (const DOM_NullPtr * other) const
+bool DOM_Range::operator != (const DOM_NullPtr * /*other*/) const
{
return this->fImpl != 0;
};
-bool DOM_Range::operator == (const DOM_NullPtr * other) const
+bool DOM_Range::operator == (const DOM_NullPtr * /*other*/) const
{
return this->fImpl == 0;
}
1.5 +4 -4
xml-xerces/c/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp
Index: DOM_TreeWalker.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOM_TreeWalker.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOM_TreeWalker.cpp 8 Sep 2004 13:55:43 -0000 1.4
+++ DOM_TreeWalker.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -57,7 +57,7 @@
};
-DOM_TreeWalker & DOM_TreeWalker::operator = (const DOM_NullPtr *other)
+DOM_TreeWalker & DOM_TreeWalker::operator = (const DOM_NullPtr * /*other*/)
{
RefCountedImpl::removeRef(this->fImpl);
this->fImpl = 0;
@@ -87,13 +87,13 @@
return this->fImpl == other.fImpl;
};
-bool DOM_TreeWalker::operator != (const DOM_NullPtr * other) const
+bool DOM_TreeWalker::operator != (const DOM_NullPtr * /*other*/) const
{
return this->fImpl != 0;
};
-bool DOM_TreeWalker::operator == (const DOM_NullPtr * other) const
+bool DOM_TreeWalker::operator == (const DOM_NullPtr * /*other*/) const
{
return this->fImpl == 0;
};
1.34 +46 -38 xml-xerces/c/src/xercesc/dom/deprecated/DOMParser.cpp
Index: DOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOMParser.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DOMParser.cpp 8 Sep 2004 13:55:42 -0000 1.33
+++ DOMParser.cpp 7 Jan 2005 14:38:22 -0000 1.34
@@ -548,8 +548,8 @@
//
---------------------------------------------------------------------------
// DOMParser: Implementation of the XMLErrorReporter interface
//
---------------------------------------------------------------------------
-void DOMParser::error( const unsigned int code
- , const XMLCh* const msgDomain
+void DOMParser::error( const unsigned int /*code*/
+ , const XMLCh* const /*msgDomain*/
, const XMLErrorReporter::ErrTypes errType
, const XMLCh* const errorText
, const XMLCh* const systemId
@@ -597,7 +597,7 @@
InputSource*
DOMParser::resolveEntity(const XMLCh* const publicId,
const XMLCh* const systemId,
- const XMLCh* const baseURI)
+ const XMLCh* const /*baseURI*/)
{
//
// Just map it to the SAX entity resolver. If there is not one
installed,
@@ -682,7 +682,7 @@
}
-void DOMParser::endEntityReference(const XMLEntityDecl& entDecl)
+void DOMParser::endEntityReference(const XMLEntityDecl& /*entDecl*/)
{
if (fCreateEntityReferenceNodes == true)
{
@@ -695,10 +695,10 @@
}
-void DOMParser::endElement( const XMLElementDecl& elemDecl
- , const unsigned int urlId
- , const bool isRoot
- , const XMLCh* const elemPrefix)
+void DOMParser::endElement( const XMLElementDecl& /*elemDecl*/
+ , const unsigned int /*urlId*/
+ , const bool /*isRoot*/
+ , const XMLCh* const /*elemPrefix*/)
{
fCurrentNode = fCurrentParent;
fCurrentParent = fNodeStack->pop();
@@ -711,7 +711,7 @@
void DOMParser::ignorableWhitespace(const XMLCh* const chars
, const unsigned int length
- , const bool cdataSection)
+ , const bool /*cdataSection*/)
{
// Ignore chars before the root element
if (!fWithinElement || !fIncludeIgnorableWhitespace)
@@ -883,7 +883,7 @@
void DOMParser::XMLDecl(const XMLCh* const version
, const XMLCh* const encoding
, const XMLCh* const standalone
- , const XMLCh* const actualEncStr)
+ , const XMLCh* const /*actualEncStr*/)
{
//This is a non-standard extension to creating XMLDecl type nodes and
attching to DOM Tree
// currently this flag it set to false unless user explicitly asks for it
@@ -932,7 +932,7 @@
(
const DTDElementDecl& elemDecl
, const DTDAttDef& attDef
- , const bool ignoring
+ , const bool /*ignoring*/
)
{
if (fDocumentType->isIntSubsetReading())
@@ -992,25 +992,30 @@
break;
case XMLAttDef::Enumeration :
- attString.appendData(chSpace);
- // attString.appendData(XMLUni::fgEnumerationString);
- const XMLCh* enumString = attDef.getEnumeration();
- int length = XMLString::stringLen(enumString);
- if (length > 0) {
-
- DOMString anotherEnumString;
-
- anotherEnumString.appendData(chOpenParen );
- for(int i=0; i<length; i++) {
- if (enumString[i] == chSpace)
- anotherEnumString.appendData(chPipe);
- else
- anotherEnumString.appendData(enumString[i]);
+ {
+ attString.appendData(chSpace);
+ // attString.appendData(XMLUni::fgEnumerationString);
+ const XMLCh* enumString = attDef.getEnumeration();
+ int length = XMLString::stringLen(enumString);
+ if (length > 0) {
+
+ DOMString anotherEnumString;
+
+ anotherEnumString.appendData(chOpenParen );
+ for(int i=0; i<length; i++) {
+ if (enumString[i] == chSpace)
+ anotherEnumString.appendData(chPipe);
+ else
+ anotherEnumString.appendData(enumString[i]);
+ }
+ anotherEnumString.appendData(chCloseParen);
+ attString.appendData(anotherEnumString);
}
- anotherEnumString.appendData(chCloseParen);
- attString.appendData(anotherEnumString);
}
break;
+ default:
+ // remaining types don't belong to a DTD
+ break;
}
//get te default types of the attlist
const XMLAttDef::DefAttTypes def = attDef.getDefaultType();
@@ -1028,6 +1033,9 @@
attString.appendData(chSpace);
attString.appendData(XMLUni::fgFixedString);
break;
+ default:
+ // remaining types don't belong to a DTD
+ break;
}
const XMLCh* defaultValue = attDef.getValue();
@@ -1071,8 +1079,8 @@
const DTDElementDecl& elemDecl
, const XMLCh* const publicId
, const XMLCh* const systemId
- , const bool hasIntSubset
- , const bool hasExtSubset
+ , const bool /*hasIntSubset*/
+ , const bool /*hasExtSubset*/
)
{
DOM_DocumentType dt;
@@ -1109,7 +1117,7 @@
void DOMParser::doctypeWhitespace
(
const XMLCh* const chars
- , const unsigned int length
+ , const unsigned int /*length*/
)
{
if (fDocumentType->isIntSubsetReading())
@@ -1119,7 +1127,7 @@
void DOMParser::elementDecl
(
const DTDElementDecl& decl
- , const bool isIgnored
+ , const bool /*isIgnored*/
)
{
if (fDocumentType->isIntSubsetReading())
@@ -1240,8 +1248,8 @@
void DOMParser::entityDecl
(
const DTDEntityDecl& entityDecl
- , const bool isPEDecl
- , const bool isIgnored
+ , const bool /*isPEDecl*/
+ , const bool /*isIgnored*/
)
{
EntityImpl* entity =
((DocumentImpl*)fDocument.fImpl)->createEntity(entityDecl.getName());
@@ -1323,7 +1331,7 @@
void DOMParser::notationDecl
(
const XMLNotationDecl& notDecl
- , const bool isIgnored
+ , const bool /*isIgnored*/
)
{
NotationImpl* notation =
((DocumentImpl*)fDocument.fImpl)->createNotation(notDecl.getName());
@@ -1345,7 +1353,7 @@
void DOMParser::startAttList
(
- const DTDElementDecl& elemDecl
+ const DTDElementDecl& /*elemDecl*/
)
{
}
@@ -1361,8 +1369,8 @@
void DOMParser::TextDecl
(
- const XMLCh* const versionStr
- , const XMLCh* const encodingStr
+ const XMLCh* const /*versionStr*/
+ , const XMLCh* const /*encodingStr*/
)
{
}
1.14 +44 -43 xml-xerces/c/src/xercesc/dom/deprecated/DOMString.cpp
Index: DOMString.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/DOMString.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DOMString.cpp 12 Dec 2004 19:29:29 -0000 1.13
+++ DOMString.cpp 7 Jan 2005 14:38:22 -0000 1.14
@@ -78,7 +78,7 @@
cleanupDomConverter.registerCleanup(reinitDomConverter);
}
return gDomConverter;
-};
+}
//
// There is one global mutex that is used to synchronize access to the
@@ -123,14 +123,14 @@
fRefCount = 0xcccc;
XMLPlatformUtils::fgMemoryManager->deallocate(this);//delete []
this; // was allocated with new char[size] !
XMLPlatformUtils::atomicDecrement(DOMString::gLiveStringDataCount);
- };
-};
+ }
+}
void DOMStringData::addRef()
{
XMLPlatformUtils::atomicIncrement(fRefCount);
-};
+}
DOMStringData *DOMStringData::allocateBuffer(unsigned int length)
@@ -238,7 +238,7 @@
XMLPlatformUtils::atomicIncrement(DOMString::gLiveStringHandleCount);
return retPtr;
-};
+}
//
@@ -268,13 +268,13 @@
}
-};
+}
void DOMStringHandle::addRef()
{
XMLPlatformUtils::atomicIncrement(fRefCount);
-};
+}
void DOMStringHandle::removeRef()
@@ -286,8 +286,8 @@
// delete this;
DOMStringHandle* ptr = this;
delete ptr;
- };
-};
+ }
+}
DOMStringHandle *DOMStringHandle::createNewStringHandle(unsigned int
bufLength)
@@ -298,7 +298,7 @@
h -> fRefCount = 1;
h -> fDSData = DOMStringData::allocateBuffer(bufLength);
return h;
-};
+}
DOMStringHandle *DOMStringHandle::cloneStringHandle()
@@ -321,15 +321,16 @@
DOMString::DOMString()
{
fHandle = 0;
-};
+}
-DOMString::DOMString(const DOMString &other)
+DOMString::DOMString(const DOMString &other) :
+ XMemory(other)
{
fHandle = other.fHandle;
if (fHandle)
fHandle->addRef();
-};
+}
DOMString::DOMString(const XMLCh *data)
@@ -420,7 +421,7 @@
}
fHandle->fLength = srcLen;
}
-};
+}
@@ -428,7 +429,7 @@
{
assert(nullValue == 0);
fHandle = 0;
-};
+}
DOMString::~DOMString()
@@ -437,7 +438,7 @@
fHandle->removeRef();
fHandle = 0;
-};
+}
DOMString & DOMString::operator =(const DOMString &other)
@@ -454,7 +455,7 @@
fHandle->addRef();
return *this;
-};
+}
DOMString & DOMString::operator = (DOM_NullPtr *arg)
@@ -465,31 +466,31 @@
fHandle = 0;
return *this;
-};
+}
bool DOMString::operator ==(const DOMString &other) const
{
return this->fHandle == other.fHandle;
-};
+}
bool DOMString::operator !=(const DOMString &other) const
{
return this->fHandle != other.fHandle;
-};
+}
-bool DOMString::operator == (const DOM_NullPtr *p) const
+bool DOMString::operator == (const DOM_NullPtr * /*p*/) const
{
return (fHandle == 0);
-};
+}
-bool DOMString::operator != (const DOM_NullPtr *p) const
+bool DOMString::operator != (const DOM_NullPtr * /*p*/) const
{
return (fHandle != 0);
-};
+}
@@ -627,7 +628,7 @@
if ((fHandle != 0) && (index < fHandle->fLength))
retCh = fHandle->fDSData->fData[index];
return retCh;
-};
+}
DOMString DOMString::clone() const
@@ -638,14 +639,14 @@
retString.fHandle = this->fHandle->cloneStringHandle();
return retString;
-};
+}
void DOMString::deleteData(unsigned int offset, unsigned int delLength)
{
unsigned int stringLen = this->length();
- if (offset > stringLen || offset < 0 || delLength < 0)
+ if (offset > stringLen)
throw DOM_DOMException(DOM_DOMException::INDEX_SIZE_ERR, 0);
// Cap the value of delLength to avoid trouble with overflows
@@ -703,7 +704,7 @@
// no characters are moved.
fHandle->fLength = newStringLength;
}
-};
+}
@@ -741,7 +742,7 @@
}
return retVal;
-};
+}
@@ -786,7 +787,7 @@
return true; // Both strings are empty. DOMString treats zero-length
// and a null data pointer as equivalent.
-};
+}
void DOMString::insertData(unsigned int offset, const DOMString &src)
@@ -845,7 +846,7 @@
unsigned int j;
for (j=0; j<srcLength; j++)
destP[j+offset] = srcP[j];
- };
+ }
fHandle->fLength += srcLength;
}
@@ -859,7 +860,7 @@
len = fHandle->fLength;
return len;
-};
+}
@@ -875,14 +876,14 @@
XMLPlatformUtils::fgMemoryManager->deallocate(pc);//delete [] pc;
}
-};
+}
void DOMString::println() const
{
print();
putchar('\n');
-};
+}
@@ -895,7 +896,7 @@
retP[fHandle->fLength]=0;
}
return retP;
-};
+}
char *DOMString::transcode() const
@@ -1011,16 +1012,16 @@
return -1;
else if (thisP[i] > otherP[i])
return 1;
- };
+ }
return 0;
-};
+}
DOMString DOMString::substringData(unsigned int offset, unsigned int count)
const
{
unsigned int thisLen = length();
- if (offset > thisLen || offset < 0 || count < 0)
+ if (offset > thisLen)
throw DOM_DOMException(DOM_DOMException::INDEX_SIZE_ERR, 0);
// Cap count to the string length to eliminate overflow
@@ -1045,14 +1046,14 @@
DOMString retString = this->clone();
retString.fHandle->fLength = count;
return retString;
- };
+ }
// The substring starts somewhere in the interior of the orignal string.
// Create a completely new DOMString. No buffer sharing is possible.
XMLCh *data = fHandle->fDSData->fData;
return DOMString(data+offset, count);
-};
+}
DOMString operator + (const DOMString &lhs, const DOMString &rhs)
@@ -1101,14 +1102,14 @@
{
delete gDomConverter; // Delete the local code page
converter.
gDomConverter = 0;
-};
+}
static void reinitDomMutex()
{
delete DOMStringHandleMutex; // Delete the synchronization mutex,
DOMStringHandleMutex = 0;
-};
+}
XERCES_CPP_NAMESPACE_END
1.6 +2 -2
xml-xerces/c/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp
Index: ElementDefinitionImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/ElementDefinitionImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElementDefinitionImpl.cpp 8 Sep 2004 13:55:43 -0000 1.5
+++ ElementDefinitionImpl.cpp 7 Jan 2005 14:38:22 -0000 1.6
@@ -38,7 +38,7 @@
ElementDefinitionImpl::ElementDefinitionImpl(
const ElementDefinitionImpl&
other,
- bool deep)
+ bool /*deep*/)
: NodeImpl(other)
{
name = other.name.clone();
1.6 +43 -42 xml-xerces/c/src/xercesc/dom/deprecated/NodeImpl.cpp
Index: NodeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/NodeImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NodeImpl.cpp 28 Sep 2004 10:56:04 -0000 1.5
+++ NodeImpl.cpp 7 Jan 2005 14:38:22 -0000 1.6
@@ -74,7 +74,8 @@
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
-NodeImpl::NodeImpl(const NodeImpl &other) {
+NodeImpl::NodeImpl(const NodeImpl &other) : NodeListImpl()
+{
this->flags = other.flags;
this->isReadOnly(false);
@@ -252,87 +253,87 @@
NodeImpl * NodeImpl::getParentNode()
{
return null; // overridden in ChildNode
-};
+}
NodeImpl* NodeImpl::getPreviousSibling()
{
return null; // overridden in ChildNode
-};
+}
void *NodeImpl::getUserData()
{
return (hasUserData()) ? getOwnerDocument()->getUserData(this) : null;
-};
+}
bool NodeImpl::hasChildNodes()
{
return false;
-};
+}
-NodeImpl *NodeImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
+NodeImpl *NodeImpl::insertBefore(NodeImpl * /*newChild*/, NodeImpl *
/*refChild*/) {
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
return 0;
-};
+}
-NodeImpl *NodeImpl::item(unsigned int index) {
+NodeImpl *NodeImpl::item(unsigned int /*index*/) {
return 0;
-};
+}
-NodeImpl *NodeImpl::removeChild(NodeImpl *oldChild)
+NodeImpl *NodeImpl::removeChild(NodeImpl * /*oldChild*/)
{
throw DOM_DOMException(DOM_DOMException::NOT_FOUND_ERR, null);
return 0;
-};
+}
-NodeImpl *NodeImpl::replaceChild(NodeImpl *newChild, NodeImpl *oldChild)
+NodeImpl *NodeImpl::replaceChild(NodeImpl * /*newChild*/, NodeImpl *
/*oldChild*/)
{
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
return 0;
-};
+}
- void NodeImpl::referenced()
- {
- RefCountedImpl::addRef(this->getOwnerDocument());
- };
-
-
- //
- // unreferenced will be called whenever the refernce count on
- // this node goes from 1 to 0. This node will only be
- // directly deleted here (by deleteIf) if it is outside
- // of the document tree.
- //
- void NodeImpl::unreferenced()
- {
- DocumentImpl *doc = this->getOwnerDocument();
- deleteIf(this); // This gets nodes outside of the document -
- // deleteIf() deletes only if the parent
- // node is null.
-
- // If this was the last external reference within the document,
- // the entire document will be deleted as well.
- RefCountedImpl::removeRef(doc);
- };
+void NodeImpl::referenced()
+{
+ RefCountedImpl::addRef(this->getOwnerDocument());
+}
-void NodeImpl::setNodeValue(const DOMString &val)
+//
+// unreferenced will be called whenever the refernce count on
+// this node goes from 1 to 0. This node will only be
+// directly deleted here (by deleteIf) if it is outside
+// of the document tree.
+//
+void NodeImpl::unreferenced()
+{
+ DocumentImpl *doc = this->getOwnerDocument();
+ deleteIf(this); // This gets nodes outside of the document -
+ // deleteIf() deletes only if the parent
+ // node is null.
+
+ // If this was the last external reference within the document,
+ // the entire document will be deleted as well.
+ RefCountedImpl::removeRef(doc);
+}
+
+
+void NodeImpl::setNodeValue(const DOMString & /*val*/)
{
// Default behavior is to do nothing, overridden in some subclasses
-};
+}
-void NodeImpl::setReadOnly(bool readOnl, bool deep)
+void NodeImpl::setReadOnly(bool readOnly, bool /*deep*/)
{
- this->isReadOnly(readOnl);
+ this->isReadOnly(readOnly);
// by default we do not have children, so deep is meaningless
// this is overridden by ParentNode
}
@@ -384,7 +385,7 @@
}
-void NodeImpl::setPrefix(const DOMString &fPrefix)
+void NodeImpl::setPrefix(const DOMString & /*fPrefix*/)
{
throw DOM_DOMException(DOM_DOMException::NAMESPACE_ERR,null);
}
1.5 +13 -12
xml-xerces/c/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp
Index: NodeIteratorImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/NodeIteratorImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeIteratorImpl.cpp 8 Sep 2004 13:55:43 -0000 1.4
+++ NodeIteratorImpl.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -35,8 +35,8 @@
//////////////////////////////////////////////////////////////////////
NodeIteratorImpl::NodeIteratorImpl ()
-: fDetached(false),
- fNodeFilter(0)
+: fNodeFilter(0),
+ fDetached(false)
{
}
@@ -57,26 +57,27 @@
unsigned long whatToShow,
DOM_NodeFilter* nodeFilter,
bool expandEntityRef)
-: fDetached(false),
- fRoot(root),
- fCurrentNode(0),
+: fRoot(root),
fWhatToShow(whatToShow),
fNodeFilter(nodeFilter),
- fForward(true),
- fExpandEntityReferences(expandEntityRef)
+ fExpandEntityReferences(expandEntityRef),
+ fDetached(false),
+ fCurrentNode(0),
+ fForward(true)
{
}
NodeIteratorImpl::NodeIteratorImpl ( const NodeIteratorImpl& toCopy)
- : fDetached(toCopy.fDetached),
+: RefCountedImpl(),
fRoot(toCopy.fRoot),
- fCurrentNode(toCopy.fCurrentNode),
fWhatToShow(toCopy.fWhatToShow),
fNodeFilter(toCopy.fNodeFilter),
- fForward(toCopy.fForward),
- fExpandEntityReferences(toCopy.fExpandEntityReferences)
+ fExpandEntityReferences(toCopy.fExpandEntityReferences),
+ fDetached(toCopy.fDetached),
+ fCurrentNode(toCopy.fCurrentNode),
+ fForward(toCopy.fForward)
{
}
1.5 +13 -13 xml-xerces/c/src/xercesc/dom/deprecated/NotationImpl.cpp
Index: NotationImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/NotationImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NotationImpl.cpp 8 Sep 2004 13:55:44 -0000 1.4
+++ NotationImpl.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -53,53 +53,53 @@
: NodeImpl(ownerDoc)
{
name = nName.clone();
-};
+}
-NotationImpl::NotationImpl(const NotationImpl &other, bool deep)
+NotationImpl::NotationImpl(const NotationImpl &other, bool /*deep*/)
: NodeImpl(other)
{
name = other.name.clone();
-};
+}
NotationImpl::~NotationImpl()
{
-};
+}
NodeImpl *NotationImpl::cloneNode(bool deep)
{
return new NotationImpl(*this, deep);
-};
+}
DOMString NotationImpl::getNodeName() {
return name;
-};
+}
short NotationImpl::getNodeType() {
return DOM_Node::NOTATION_NODE;
-};
+}
// Notation nodes do not have a parent
NodeImpl * NotationImpl::getParentNode()
{
return 0;
-};
+}
DOMString NotationImpl::getPublicId()
{
return publicId.clone();
-};
+}
DOMString NotationImpl::getSystemId()
{
return systemId.clone();
-};
+}
void NotationImpl::setPublicId(const DOMString &arg)
@@ -109,7 +109,7 @@
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
publicId = arg.clone();
-};
+}
void NotationImpl::setSystemId(const DOMString &arg)
@@ -119,7 +119,7 @@
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
systemId = arg.clone();
-};
+}
XERCES_CPP_NAMESPACE_END
1.5 +2 -2
xml-xerces/c/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp
Index: ProcessingInstructionImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/ProcessingInstructionImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProcessingInstructionImpl.cpp 8 Sep 2004 13:55:44 -0000 1.4
+++ ProcessingInstructionImpl.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -39,7 +39,7 @@
ProcessingInstructionImpl::ProcessingInstructionImpl(
const ProcessingInstructionImpl
&other,
- bool deep)
+ bool /*deep*/)
: ChildNode(other)
{
target = other.target.clone();
1.7 +8 -9 xml-xerces/c/src/xercesc/dom/deprecated/RangeImpl.cpp
Index: RangeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/RangeImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RangeImpl.cpp 23 Sep 2004 00:50:49 -0000 1.6
+++ RangeImpl.cpp 7 Jan 2005 14:38:22 -0000 1.7
@@ -40,18 +40,18 @@
RangeImpl::RangeImpl(DOM_Document doc)
- : fDocument(doc),
- fStartContainer(doc),
+ : fStartContainer(doc),
fStartOffset(0),
fEndContainer(doc),
fEndOffset(0),
- fDetached(false),
fCollapsed(true),
+ fDocument(doc),
+ fDetached(false),
fRemoveChild(0)
{
}
-RangeImpl::RangeImpl(const RangeImpl& other)
+RangeImpl::RangeImpl(const RangeImpl& other) : RefCountedImpl()
{
fDocument = other.fDocument;
fStartContainer = other.fStartContainer;
@@ -544,6 +544,9 @@
offsetB = srcRange->getEndOffset();
offsetA = fEndOffset;
break;
+ default:
+ throw DOM_DOMException(
+ DOM_DOMException::INVALID_STATE_ERR, null);
}
// case 1: same container
@@ -892,10 +895,6 @@
void RangeImpl::checkIndex(const DOM_Node& node, unsigned int offset) const
{
- if (offset < 0) {
- throw DOM_DOMException( DOM_DOMException::INDEX_SIZE_ERR, null );
- }
-
short type = node.getNodeType();
if((type == DOM_Node::TEXT_NODE
1.6 +2 -2 xml-xerces/c/src/xercesc/dom/deprecated/TextImpl.cpp
Index: TextImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/TextImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TextImpl.cpp 8 Sep 2004 13:55:44 -0000 1.5
+++ TextImpl.cpp 7 Jan 2005 14:38:22 -0000 1.6
@@ -80,7 +80,7 @@
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
unsigned int len = data.length();
- if (offset > len || offset < 0)
+ if (offset > len)
throw DOM_DOMException(DOM_DOMException::INDEX_SIZE_ERR, null);
TextImpl *newText =
1.5 +7 -6
xml-xerces/c/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp
Index: TreeWalkerImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/TreeWalkerImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TreeWalkerImpl.cpp 8 Sep 2004 13:55:44 -0000 1.4
+++ TreeWalkerImpl.cpp 7 Jan 2005 14:38:22 -0000 1.5
@@ -32,10 +32,10 @@
unsigned long whatToShow,
DOM_NodeFilter* nodeFilter,
bool expandEntityRef)
-: fCurrentNode(root),
- fRoot(root),
- fWhatToShow(whatToShow),
+: fWhatToShow(whatToShow),
fNodeFilter(nodeFilter),
+ fCurrentNode(root),
+ fRoot(root),
fExpandEntityReferences(expandEntityRef)
{
@@ -43,10 +43,11 @@
TreeWalkerImpl::TreeWalkerImpl (const TreeWalkerImpl& twi)
-: fCurrentNode(twi.fCurrentNode),
- fRoot(twi.fRoot),
+: RefCountedImpl(),
fWhatToShow(twi.fWhatToShow),
fNodeFilter(twi.fNodeFilter),
+ fCurrentNode(twi.fCurrentNode),
+ fRoot(twi.fRoot),
fExpandEntityReferences(twi.fExpandEntityReferences)
{
}
1.7 +6 -6 xml-xerces/c/src/xercesc/dom/deprecated/XMLDeclImpl.cpp
Index: XMLDeclImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/XMLDeclImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLDeclImpl.cpp 8 Sep 2004 13:55:44 -0000 1.6
+++ XMLDeclImpl.cpp 7 Jan 2005 14:38:22 -0000 1.7
@@ -36,7 +36,7 @@
encoding (DOMString(XMLUni::fgUTF8EncodingString)),
standalone (DOMString(XMLUni::fgNoString))
{
-};
+}
//Introduced in DOM Level 2
@@ -47,21 +47,21 @@
encoding ( enc.clone() ),
standalone ( isStd.clone() )
{
-};
+}
-XMLDeclImpl::XMLDeclImpl(const XMLDeclImpl &other, bool deep)
+XMLDeclImpl::XMLDeclImpl(const XMLDeclImpl &other, bool /*deep*/)
: ChildNode(other)
{
version = other.version.clone();
encoding = other.encoding.clone();
standalone = other.standalone.clone();
-};
+}
XMLDeclImpl::~XMLDeclImpl()
{
-};
+}
NodeImpl * XMLDeclImpl::cloneNode(bool deep)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
