diff --git a/src/xercesc/dom/DOMConfiguration.hpp b/src/xercesc/dom/DOMConfiguration.hpp
index d4b9bab38a2351b14d41d9d6435b65bf84d1453f..e6e767f39ae388db7b7f258468c7d5e1d4b09e0e 100644
--- a/src/xercesc/dom/DOMConfiguration.hpp
+++ b/src/xercesc/dom/DOMConfiguration.hpp
@@ -463,8 +463,16 @@ protected:
/** @name Hidden constructors */
//@{
DOMConfiguration() {};
- DOMConfiguration(const DOMConfiguration &) {};
- DOMConfiguration & operator = (const DOMConfiguration &) {return *this;};
+ //@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ /** @name Unimplemented constructors and operators */
+ //@{
+ DOMConfiguration(const DOMConfiguration &);
+ DOMConfiguration & operator = (const DOMConfiguration &);
//@}
public:
@@ -518,6 +526,18 @@ public:
* @since DOM level 3
**/
virtual bool canSetParameter(const XMLCh* name, const void* value) const = 0;
+
+ // -----------------------------------------------------------------------
+ // All constructors are hidden, just the destructor is available
+ // -----------------------------------------------------------------------
+ /** @name Destructor */
+ //@{
+ /**
+ * Destructor
+ *
+ */
+ virtual ~DOMConfiguration() {};
+ //@}
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMException.cpp b/src/xercesc/dom/DOMException.cpp
index 68011c7dcfd9f36c26ad96e7ba15acf89f64071a..979b80788e734446b9d867e5004fe2b526d707cf 100644
--- a/src/xercesc/dom/DOMException.cpp
+++ b/src/xercesc/dom/DOMException.cpp
@@ -64,29 +64,28 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMException::DOMException()
-: msg(0)
-{
- code = (ExceptionCode) 0;
-};
+: code((ExceptionCode) 0)
+, msg(0)
+{
+}
DOMException::DOMException(short exCode, const XMLCh *message)
-: msg(message)
-{
- code = (ExceptionCode) exCode;
-};
+: code ((ExceptionCode) exCode)
+, msg(message)
+{
+}
DOMException::DOMException(const DOMException &other)
-: msg(other.msg)
+: code(other.code)
+, msg(other.msg)
{
- code = other.code;
-};
-
+}
DOMException::~DOMException()
{
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMException.hpp b/src/xercesc/dom/DOMException.hpp
index e6af66d626395893df3ec49caea922f41912c16f..a09ed4665cad10a8d404e8f883e18e3512c34a27 100644
--- a/src/xercesc/dom/DOMException.hpp
+++ b/src/xercesc/dom/DOMException.hpp
@@ -247,6 +247,11 @@ public:
const XMLCh *msg;
//@}
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMException & operator = (const DOMException &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMImplementationRegistry.hpp b/src/xercesc/dom/DOMImplementationRegistry.hpp
index f3cb177eaa1a6da85282005a7ade094835d888db..45dc2e0f9cd6875a763121d88b23d0e6401c2588 100644
--- a/src/xercesc/dom/DOMImplementationRegistry.hpp
+++ b/src/xercesc/dom/DOMImplementationRegistry.hpp
@@ -118,6 +118,9 @@ public:
*/
static void addSource(DOMImplementationSource* source);
//@}
+
+private:
+ DOMImplementationRegistry();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMRangeException.cpp b/src/xercesc/dom/DOMRangeException.cpp
index 0c16468c6dd9d508d02cad7569db560b30ac619d..90ccdbc3a911232cdf225fc9f9a9aea73b239b5e 100644
--- a/src/xercesc/dom/DOMRangeException.cpp
+++ b/src/xercesc/dom/DOMRangeException.cpp
@@ -65,28 +65,28 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMRangeException::DOMRangeException()
: DOMException()
+, code((RangeExceptionCode) 0)
{
- code = (RangeExceptionCode) 0;
-};
+}
DOMRangeException::DOMRangeException(RangeExceptionCode exCode, const XMLCh* message)
: DOMException(exCode, message)
+, code(exCode)
{
- code = exCode;
-};
+}
DOMRangeException::DOMRangeException(const DOMRangeException &other)
: DOMException(other)
+, code(other.code)
{
- code = other.code;
-};
+}
DOMRangeException::~DOMRangeException()
{
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMRangeException.hpp b/src/xercesc/dom/DOMRangeException.hpp
index 6fe4eb9ac3d4e2aaeb076429554799cf2bacb89d..ac37001eae93e16f5921f380c600ced2b0f39ac1 100644
--- a/src/xercesc/dom/DOMRangeException.hpp
+++ b/src/xercesc/dom/DOMRangeException.hpp
@@ -153,6 +153,11 @@ public:
//@}
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMRangeException & operator = (const DOMRangeException &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMXPathException.cpp b/src/xercesc/dom/DOMXPathException.cpp
index bcc5b0c97181ec87e4520f0afadd6759cb99b8c8..69efc1fda1320db4067c0ae19be3c72d0f026e76 100644
--- a/src/xercesc/dom/DOMXPathException.cpp
+++ b/src/xercesc/dom/DOMXPathException.cpp
@@ -61,29 +61,29 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMXPathException::DOMXPathException()
-: msg(0)
+: code((ExceptionCode) 0)
+, msg(0)
{
- code = (ExceptionCode) 0;
-};
+}
DOMXPathException::DOMXPathException(short exCode, const XMLCh *message)
-: msg(message)
+: code((ExceptionCode) exCode)
+, msg(message)
{
- code = (ExceptionCode) exCode;
-};
+}
DOMXPathException::DOMXPathException(const DOMXPathException &other)
-: msg(other.msg)
-{
- code = other.code;
-};
+: code(other.code)
+, msg(other.msg)
+{
+}
DOMXPathException::~DOMXPathException()
{
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/DOMXPathException.hpp b/src/xercesc/dom/DOMXPathException.hpp
index 4a1ef3a180027a66785a059b566df3cfbdeb0e79..83a118441b62084a4e9f491d0b95982535a7a174 100644
--- a/src/xercesc/dom/DOMXPathException.hpp
+++ b/src/xercesc/dom/DOMXPathException.hpp
@@ -143,6 +143,12 @@ public:
*/
const XMLCh *msg;
//@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMXPathException& operator = (const DOMXPathException&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/deprecated/DOMParser.hpp b/src/xercesc/dom/deprecated/DOMParser.hpp
index 5546be1b8804b356279a4ae192e4eb9034452b46..b95aabbb886f3a4adc741bfcb9f94d2378b481f6 100644
--- a/src/xercesc/dom/deprecated/DOMParser.hpp
+++ b/src/xercesc/dom/deprecated/DOMParser.hpp
@@ -1785,6 +1785,10 @@ private :
void initialize();
void cleanUp();
+ // unimplemented
+ DOMParser ( const DOMParser& toCopy);
+ DOMParser& operator= (const DOMParser& other);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/dom/impl/DOMAttrImpl.cpp b/src/xercesc/dom/impl/DOMAttrImpl.cpp
index 30c004954cd2dae280a711c663ec13ca9e03c62f..ba877b3d62196dfb70696b1f328ed406fe8378f7 100644
--- a/src/xercesc/dom/impl/DOMAttrImpl.cpp
+++ b/src/xercesc/dom/impl/DOMAttrImpl.cpp
@@ -75,13 +75,11 @@ DOMAttrImpl::DOMAttrImpl(DOMDocument *ownerDoc, const XMLCh *aName)
DOMDocumentImpl *docImpl = (DOMDocumentImpl *)ownerDoc;
fName = docImpl->getPooledString(aName);
fNode.isSpecified(true);
-};
-
-DOMAttrImpl::DOMAttrImpl(const DOMAttrImpl &other, bool deep)
- : fNode(other.fNode), fParent (other.fParent), fSchemaType(other.fSchemaType)
-{
- fName = other.fName;
+}
+DOMAttrImpl::DOMAttrImpl(const DOMAttrImpl &other, bool)
+ : fNode(other.fNode), fParent (other.fParent), fName(other.fName), fSchemaType(other.fSchemaType)
+{
if (other.fNode.isSpecified())
fNode.isSpecified(true);
else
@@ -95,11 +93,11 @@ DOMAttrImpl::DOMAttrImpl(const DOMAttrImpl &other, bool deep)
}
fParent.cloneChildren(&other);
-};
+}
DOMAttrImpl::~DOMAttrImpl() {
-};
+}
DOMNode * DOMAttrImpl::cloneNode(bool deep) const
@@ -107,34 +105,34 @@ DOMNode * DOMAttrImpl::cloneNode(bool deep) const
DOMNode* newNode = new (this->getOwnerDocument(), DOMDocumentImpl::ATTR_OBJECT) DOMAttrImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMAttrImpl::getNodeName() const{
return fName;
-};
+}
short DOMAttrImpl::getNodeType() const {
return DOMNode::ATTRIBUTE_NODE;
-};
+}
const XMLCh * DOMAttrImpl::getName() const {
return fName;
-};
+}
const XMLCh * DOMAttrImpl::getNodeValue() const
{
return getValue();
-};
+}
bool DOMAttrImpl::getSpecified() const
{
return fNode.isSpecified();
-};
+}
@@ -166,7 +164,7 @@ const XMLCh * DOMAttrImpl::getValue() const
getTextValue(fParent.fFirstChild, buf);
return (XMLCh*) ((DOMDocumentImpl *)this->getOwnerDocument())->getPooledString(buf.getRawBuffer());
-};
+}
void DOMAttrImpl::getTextValue(DOMNode* node, XMLBuffer& buf) const
{
@@ -187,14 +185,14 @@ void DOMAttrImpl::getTextValue(DOMNode* node, XMLBuffer& buf) const
void DOMAttrImpl::setNodeValue(const XMLCh *val)
{
setValue(val);
-};
+}
void DOMAttrImpl::setSpecified(bool arg)
{
fNode.isSpecified(arg);
-};
+}
@@ -230,7 +228,7 @@ void DOMAttrImpl::setValue(const XMLCh *val)
if (fNode.isIdAttr())
doc->getNodeIDMap()->add(this);
-};
+}
@@ -337,42 +335,42 @@ void DOMAttrImpl::setTypeInfo(const XMLCh* typeName, const XMLCh* typeURI)
}
- DOMNode* DOMAttrImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); };
- DOMNamedNodeMap* DOMAttrImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMAttrImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMAttrImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMAttrImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMAttrImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMAttrImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMAttrImpl::getNextSibling() const {return fNode.getNextSibling (); };
- DOMDocument* DOMAttrImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMAttrImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMAttrImpl::getParentNode() const {return fNode.getParentNode (); };
- DOMNode* DOMAttrImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); };
- bool DOMAttrImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
+ DOMNode* DOMAttrImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); }
+ DOMNamedNodeMap* DOMAttrImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMAttrImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMAttrImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMAttrImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMAttrImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMAttrImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMAttrImpl::getNextSibling() const {return fNode.getNextSibling (); }
+ DOMDocument* DOMAttrImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMAttrImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMAttrImpl::getParentNode() const {return fNode.getParentNode (); }
+ DOMNode* DOMAttrImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); }
+ bool DOMAttrImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
DOMNode* DOMAttrImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fParent.insertBefore (newChild, refChild); };
- void DOMAttrImpl::normalize() {fParent.normalize (); };
- DOMNode* DOMAttrImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); };
+ {return fParent.insertBefore (newChild, refChild); }
+ void DOMAttrImpl::normalize() {fParent.normalize (); }
+ DOMNode* DOMAttrImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); }
DOMNode* DOMAttrImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fParent.replaceChild (newChild, oldChild); };
+ {return fParent.replaceChild (newChild, oldChild); }
bool DOMAttrImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMAttrImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMAttrImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMAttrImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMAttrImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMAttrImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMAttrImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMAttrImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMAttrImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }
void* DOMAttrImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMAttrImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- const XMLCh* DOMAttrImpl::getBaseURI() const {return fNode.getBaseURI(); };
- short DOMAttrImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMAttrImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMAttrImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMAttrImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMAttrImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMAttrImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMAttrImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMAttrImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ const XMLCh* DOMAttrImpl::getBaseURI() const {return fNode.getBaseURI(); }
+ short DOMAttrImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMAttrImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMAttrImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMAttrImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMAttrImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMAttrImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMAttrImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMAttrImpl.hpp b/src/xercesc/dom/impl/DOMAttrImpl.hpp
index a0fea89189084aef476920e0be882202270419e9..b5bb6ad11f7ef0d48967a34733be777d0b94b25f 100644
--- a/src/xercesc/dom/impl/DOMAttrImpl.hpp
+++ b/src/xercesc/dom/impl/DOMAttrImpl.hpp
@@ -128,6 +128,11 @@ public:
virtual void removeAttrFromIDNodeMap();
private:
void getTextValue(DOMNode* node, XMLBuffer& buf) const;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMAttrImpl& operator=(const DOMAttrImpl&);
};
inline void DOMAttrImpl::removeAttrFromIDNodeMap()
diff --git a/src/xercesc/dom/impl/DOMAttrMapImpl.hpp b/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
index 18fe7c54c86409e3fd9962bf1b42eddf4f2f9659..314b7b98b911bd812394b5dc344d540c376e7075 100644
--- a/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
+++ b/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
@@ -107,6 +107,13 @@ public:
void reconcileDefaultAttributes(const DOMAttrMapImpl* defaults);
void moveSpecifiedAttributes(DOMAttrMapImpl* srcmap);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMAttrMapImpl(const DOMAttrMapImpl &);
+ DOMAttrMapImpl & operator = (const DOMAttrMapImpl &);
};
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/dom/impl/DOMAttrNSImpl.cpp b/src/xercesc/dom/impl/DOMAttrNSImpl.cpp
index 1e93a266f849adde059981ab1714b00ce1c00e03..779a738f6a45e503a17de1388969d54c5b0a60c8 100644
--- a/src/xercesc/dom/impl/DOMAttrNSImpl.cpp
+++ b/src/xercesc/dom/impl/DOMAttrNSImpl.cpp
@@ -92,14 +92,14 @@ DOMAttrImpl(other, deep)
this->fNamespaceURI = other.fNamespaceURI; //DOM Level 2
this->fLocalName = other.fLocalName; //DOM Level 2
this->fPrefix = other.fPrefix;
-};
+}
DOMNode * DOMAttrNSImpl::cloneNode(bool deep) const
{
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::ATTR_NS_OBJECT) DOMAttrNSImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMAttrNSImpl::getNamespaceURI() const
{
@@ -260,7 +260,7 @@ void DOMAttrNSImpl::setName(const XMLCh* namespaceURI, const XMLCh* qualifiedNam
DOMNode::ATTRIBUTE_NODE
);
this -> fNamespaceURI = (URI == 0) ? 0 : ownerDoc->getPooledString(URI);
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMAttrNSImpl.hpp b/src/xercesc/dom/impl/DOMAttrNSImpl.hpp
index 5206c0dff1e9688aba0f969de4d3c44554c229f2..d8dd7d8dfc3e4b11aa9e7318a89fd93aa4c91bea 100644
--- a/src/xercesc/dom/impl/DOMAttrNSImpl.hpp
+++ b/src/xercesc/dom/impl/DOMAttrNSImpl.hpp
@@ -101,6 +101,12 @@ public:
// helper function for DOM Level 3 renameNode
virtual DOMNode* rename(const XMLCh* namespaceURI, const XMLCh* name);
void setName(const XMLCh* namespaceURI, const XMLCh* name);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMAttrNSImpl & operator = (const DOMAttrNSImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp b/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
index 9de86a501dc609648d8292a8e31b52ac2b9e7268..dc42608207a9dd124134859c8fb2dfcd556a8195 100644
--- a/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
@@ -74,22 +74,22 @@ DOMCDATASectionImpl::DOMCDATASectionImpl(DOMDocument *ownerDoc,
const XMLCh *dat)
: fNode(ownerDoc), fParent(ownerDoc), fCharacterData(ownerDoc, dat)
{
-};
+}
-DOMCDATASectionImpl::DOMCDATASectionImpl(const DOMCDATASectionImpl &other, bool deep)
+DOMCDATASectionImpl::DOMCDATASectionImpl(const DOMCDATASectionImpl &other, bool)
: fNode(*castToNodeImpl(&other)),
fParent(*castToParentImpl(&other)),
fChild(*castToChildImpl(&other)),
fCharacterData(other.fCharacterData)
{
// revisit. SOmething nees to make "deep" work.
-};
+}
DOMCDATASectionImpl::~DOMCDATASectionImpl()
{
-};
+}
DOMNode *DOMCDATASectionImpl::cloneNode(bool deep) const
@@ -97,19 +97,19 @@ DOMNode *DOMCDATASectionImpl::cloneNode(bool deep) const
DOMNode* newNode = new (this->getOwnerDocument(), DOMDocumentImpl::CDATA_SECTION_OBJECT) DOMCDATASectionImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMCDATASectionImpl::getNodeName() const {
static const XMLCh gcdata_section[] = {chPound, chLatin_c, chLatin_d, chLatin_a, chLatin_t, chLatin_a,
chDash, chLatin_s, chLatin_e, chLatin_c, chLatin_t, chLatin_i, chLatin_o, chLatin_n, 0};
return gcdata_section;
-};
+}
short DOMCDATASectionImpl::getNodeType() const {
return DOMNode::CDATA_SECTION_NODE;
-};
+}
bool DOMCDATASectionImpl::isIgnorableWhitespace() const
@@ -156,7 +156,7 @@ DOMText *DOMCDATASectionImpl::splitText(XMLSize_t offset)
}
return newText;
-};
+}
bool DOMCDATASectionImpl::getIsWhitespaceInElementContent() const
@@ -169,7 +169,7 @@ const XMLCh* DOMCDATASectionImpl::getWholeText() {
return 0;
}
-DOMText* DOMCDATASectionImpl::replaceWholeText(const XMLCh* content){
+DOMText* DOMCDATASectionImpl::replaceWholeText(const XMLCh*){
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
@@ -198,43 +198,43 @@ void DOMCDATASectionImpl::release()
//
// Delegation stubs for other DOM_Node inherited functions.
//
- DOMNode* DOMCDATASectionImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); };
- DOMNamedNodeMap* DOMCDATASectionImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMCDATASectionImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMCDATASectionImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMCDATASectionImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMCDATASectionImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMCDATASectionImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMCDATASectionImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMCDATASectionImpl::getNodeValue() const {return fCharacterData.getNodeValue (); };
- DOMDocument* DOMCDATASectionImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMCDATASectionImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMCDATASectionImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMCDATASectionImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMCDATASectionImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
+ DOMNode* DOMCDATASectionImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); }
+ DOMNamedNodeMap* DOMCDATASectionImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMCDATASectionImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMCDATASectionImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMCDATASectionImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMCDATASectionImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMCDATASectionImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMCDATASectionImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMCDATASectionImpl::getNodeValue() const {return fCharacterData.getNodeValue (); }
+ DOMDocument* DOMCDATASectionImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMCDATASectionImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMCDATASectionImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMCDATASectionImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMCDATASectionImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
DOMNode* DOMCDATASectionImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fParent.insertBefore (newChild, refChild); };
- void DOMCDATASectionImpl::normalize() {fNode.normalize (); };
- DOMNode* DOMCDATASectionImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); };
+ {return fParent.insertBefore (newChild, refChild); }
+ void DOMCDATASectionImpl::normalize() {fNode.normalize (); }
+ DOMNode* DOMCDATASectionImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); }
DOMNode* DOMCDATASectionImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fParent.replaceChild (newChild, oldChild); };
+ {return fParent.replaceChild (newChild, oldChild); }
bool DOMCDATASectionImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMCDATASectionImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMCDATASectionImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMCDATASectionImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMCDATASectionImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMCDATASectionImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMCDATASectionImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMCDATASectionImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMCDATASectionImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }
void* DOMCDATASectionImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMCDATASectionImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- const XMLCh* DOMCDATASectionImpl::getBaseURI() const {return fNode.getBaseURI(); };
- short DOMCDATASectionImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMCDATASectionImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMCDATASectionImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMCDATASectionImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMCDATASectionImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMCDATASectionImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMCDATASectionImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMCDATASectionImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ const XMLCh* DOMCDATASectionImpl::getBaseURI() const {return fNode.getBaseURI(); }
+ short DOMCDATASectionImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMCDATASectionImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMCDATASectionImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMCDATASectionImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMCDATASectionImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMCDATASectionImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMCDATASectionImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
@@ -243,19 +243,19 @@ void DOMCDATASectionImpl::release()
//
- const XMLCh* DOMCDATASectionImpl::getData() const {return fCharacterData.getData();};
- XMLSize_t DOMCDATASectionImpl::getLength() const {return fCharacterData.getLength();};
+ const XMLCh* DOMCDATASectionImpl::getData() const {return fCharacterData.getData();}
+ XMLSize_t DOMCDATASectionImpl::getLength() const {return fCharacterData.getLength();}
const XMLCh* DOMCDATASectionImpl::substringData(XMLSize_t offset, XMLSize_t count) const
- {return fCharacterData.substringData(this, offset, count);};
- void DOMCDATASectionImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
+ {return fCharacterData.substringData(this, offset, count);}
+ void DOMCDATASectionImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);}
void DOMCDATASectionImpl::insertData(XMLSize_t offset, const XMLCh *arg)
- {fCharacterData.insertData(this, offset, arg);};
+ {fCharacterData.insertData(this, offset, arg);}
void DOMCDATASectionImpl::deleteData(XMLSize_t offset, XMLSize_t count)
- {fCharacterData.deleteData(this, offset, count);};
+ {fCharacterData.deleteData(this, offset, count);}
void DOMCDATASectionImpl::replaceData(XMLSize_t offset, XMLSize_t count, const XMLCh *arg)
- {fCharacterData.replaceData(this, offset, count, arg);};
- void DOMCDATASectionImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
- void DOMCDATASectionImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+ {fCharacterData.replaceData(this, offset, count, arg);}
+ void DOMCDATASectionImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);}
+ void DOMCDATASectionImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp b/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
index a42e30a3d7bfeeb4a79d994c1d60b6331f94e773..ae8a5e7ca85e072bf693a40a03ac156161eb5501 100644
--- a/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
@@ -123,7 +123,11 @@ public:
const XMLCh *arg);
virtual void setData(const XMLCh *data);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMCDATASectionImpl & operator = (const DOMCDATASectionImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp b/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
index f6ac1342b6de4ecbfd43639d04b1ce3efff726b7..4bbe5cc53f53b57a95d09246df2ad57ea7a5f068 100644
--- a/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
@@ -71,8 +71,8 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMCharacterDataImpl::DOMCharacterDataImpl(DOMDocument *doc, const XMLCh *dat)
- : fDoc(0)
- , fDataBuf(0)
+ : fDataBuf(0)
+ , fDoc(0)
{
fDoc = (DOMDocumentImpl*)doc;
@@ -82,12 +82,12 @@ DOMCharacterDataImpl::DOMCharacterDataImpl(DOMDocument *doc, const XMLCh *dat)
else
fDataBuf->set(dat);
-};
+}
DOMCharacterDataImpl::DOMCharacterDataImpl(const DOMCharacterDataImpl &other)
- : fDoc(0)
- , fDataBuf(0)
+ : fDataBuf(0)
+ , fDoc(0)
{
fDoc = (DOMDocumentImpl*)other.fDoc;
@@ -97,17 +97,17 @@ DOMCharacterDataImpl::DOMCharacterDataImpl(const DOMCharacterDataImpl &other)
else
fDataBuf->set(other.fDataBuf->getRawBuffer());
-};
+}
DOMCharacterDataImpl::~DOMCharacterDataImpl() {
-};
+}
const XMLCh * DOMCharacterDataImpl::getNodeValue() const
{
return fDataBuf->getRawBuffer();
-};
+}
void DOMCharacterDataImpl::setNodeValue(const DOMNode *node, const XMLCh *value)
@@ -128,7 +128,7 @@ void DOMCharacterDataImpl::setNodeValue(const DOMNode *node, const XMLCh *value)
}
}
}
-};
+}
void DOMCharacterDataImpl::appendData(const DOMNode *node, const XMLCh *dat)
@@ -138,7 +138,7 @@ void DOMCharacterDataImpl::appendData(const DOMNode *node, const XMLCh *dat)
DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
fDataBuf->append(dat);
-};
+}
void DOMCharacterDataImpl::deleteData(const DOMNode *node, XMLSize_t offset, XMLSize_t count)
@@ -201,14 +201,14 @@ void DOMCharacterDataImpl::deleteData(const DOMNode *node, XMLSize_t offset, XML
}
}
}
-};
+}
const XMLCh *DOMCharacterDataImpl::getData() const
{
return fDataBuf->getRawBuffer();
-};
+}
//
@@ -217,7 +217,7 @@ const XMLCh *DOMCharacterDataImpl::getData() const
XMLSize_t DOMCharacterDataImpl::getLength() const
{
return fDataBuf->getLen();
-};
+}
@@ -282,7 +282,7 @@ void DOMCharacterDataImpl::replaceData(const DOMNode *node, XMLSize_t offset, XM
deleteData(node, offset, count);
insertData(node, offset, dat);
-};
+}
@@ -290,7 +290,7 @@ void DOMCharacterDataImpl::replaceData(const DOMNode *node, XMLSize_t offset, XM
void DOMCharacterDataImpl::setData(const DOMNode *node, const XMLCh *arg)
{
setNodeValue(node, arg);
-};
+}
@@ -331,7 +331,7 @@ const XMLCh * DOMCharacterDataImpl::substringData(const DOMNode *node, XMLSize_t
return retString;
-};
+}
void DOMCharacterDataImpl::releaseBuffer() {
diff --git a/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp b/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
index ea620ecbf60a994180ce1527707dd1fe87aaf405..4cb637eeb8129f7201b12de1fb2410ae74b47e11 100644
--- a/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
@@ -111,6 +111,11 @@ public:
const XMLCh* substringData(const DOMNode *node, XMLSize_t offset, XMLSize_t count) const;
void releaseBuffer();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMCharacterDataImpl & operator = (const DOMCharacterDataImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMChildNode.cpp b/src/xercesc/dom/impl/DOMChildNode.cpp
index 6029ef4a8378b6e467cb117cae2affb8f79af9f7..f1fe199fb02decba1bd61f65c5607232eabc0c98 100644
--- a/src/xercesc/dom/impl/DOMChildNode.cpp
+++ b/src/xercesc/dom/impl/DOMChildNode.cpp
@@ -72,24 +72,24 @@ DOMChildNode::DOMChildNode()
{
this->previousSibling = 0;
this->nextSibling = 0;
-};
+}
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
-DOMChildNode::DOMChildNode(const DOMChildNode &other)
+DOMChildNode::DOMChildNode(const DOMChildNode &)
{
// Need to break the association w/ original siblings and parent
this->previousSibling = 0;
this->nextSibling = 0;
-};
+}
DOMChildNode::~DOMChildNode() {
-};
+}
DOMNode * DOMChildNode::getNextSibling() const {
return nextSibling;
-};
+}
//
// Note: for getParentNode and getPreviousSibling(), below, an
@@ -105,13 +105,13 @@ DOMNode * DOMChildNode::getParentNode(const DOMNode *thisNode) const
// our ownerDocument and we don't have a parent
DOMNodeImpl *thisNodeImpl = castToNodeImpl(thisNode);
return thisNodeImpl->isOwned() ? thisNodeImpl->fOwnerNode : 0;
-};
+}
DOMNode * DOMChildNode::getPreviousSibling(const DOMNode *thisNode) const {
// if we are the firstChild, previousSibling actually refers to our
// parent's lastChild, but we hide that
return castToNodeImpl(thisNode)->isFirstChild() ? 0 : previousSibling;
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMChildNode.hpp b/src/xercesc/dom/impl/DOMChildNode.hpp
index c1b248ab9ea4fb89d00603b21fd38528748ac7a0..b4f3795bb9777d670f7fcf231b060b69a490eeba 100644
--- a/src/xercesc/dom/impl/DOMChildNode.hpp
+++ b/src/xercesc/dom/impl/DOMChildNode.hpp
@@ -97,6 +97,12 @@ public:
DOMNode * getNextSibling() const;
DOMNode * getParentNode(const DOMNode *thisNode) const;
DOMNode * getPreviousSibling(const DOMNode *thisNode) const;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMChildNode & operator = (const DOMChildNode &);
};
diff --git a/src/xercesc/dom/impl/DOMCommentImpl.cpp b/src/xercesc/dom/impl/DOMCommentImpl.cpp
index 9aa3c455e4e27da01a27c11338030beec6582341..8ef9db7b4f80c8e13fb15c99eca77b3b6687a4aa 100644
--- a/src/xercesc/dom/impl/DOMCommentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCommentImpl.cpp
@@ -75,21 +75,21 @@ DOMCommentImpl::DOMCommentImpl(DOMDocument *ownerDoc, const XMLCh *dat)
: fNode(ownerDoc), fCharacterData(ownerDoc, dat)
{
fNode.setIsLeafNode(true);
-};
+}
-DOMCommentImpl::DOMCommentImpl(const DOMCommentImpl &other, bool deep)
+DOMCommentImpl::DOMCommentImpl(const DOMCommentImpl &other, bool)
: fNode(other.fNode),
fChild(other.fChild),
fCharacterData(other.fCharacterData)
{
fNode.setIsLeafNode(true);
-};
+}
DOMCommentImpl::~DOMCommentImpl() {
-};
+}
@@ -98,7 +98,7 @@ DOMNode * DOMCommentImpl::cloneNode(bool deep) const
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::COMMENT_OBJECT) DOMCommentImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMCommentImpl::getNodeName() const {
@@ -164,46 +164,46 @@ DOMComment *DOMCommentImpl::splitText(XMLSize_t offset)
}
return newText;
-};
-
-
- DOMNode* DOMCommentImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); };
- DOMNamedNodeMap* DOMCommentImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMCommentImpl::getChildNodes() const {return fNode.getChildNodes (); };
- DOMNode* DOMCommentImpl::getFirstChild() const {return fNode.getFirstChild (); };
- DOMNode* DOMCommentImpl::getLastChild() const {return fNode.getLastChild (); };
- const XMLCh* DOMCommentImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMCommentImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMCommentImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMCommentImpl::getNodeValue() const {return fCharacterData.getNodeValue (); };
- DOMDocument* DOMCommentImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); };
- const XMLCh* DOMCommentImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMCommentImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMCommentImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMCommentImpl::hasChildNodes() const {return fNode.hasChildNodes (); };
+}
+
+
+ DOMNode* DOMCommentImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); }
+ DOMNamedNodeMap* DOMCommentImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMCommentImpl::getChildNodes() const {return fNode.getChildNodes (); }
+ DOMNode* DOMCommentImpl::getFirstChild() const {return fNode.getFirstChild (); }
+ DOMNode* DOMCommentImpl::getLastChild() const {return fNode.getLastChild (); }
+ const XMLCh* DOMCommentImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMCommentImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMCommentImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMCommentImpl::getNodeValue() const {return fCharacterData.getNodeValue (); }
+ DOMDocument* DOMCommentImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); }
+ const XMLCh* DOMCommentImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMCommentImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMCommentImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMCommentImpl::hasChildNodes() const {return fNode.hasChildNodes (); }
DOMNode* DOMCommentImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fNode.insertBefore (newChild, refChild); };
- void DOMCommentImpl::normalize() {fNode.normalize (); };
- DOMNode* DOMCommentImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); };
+ {return fNode.insertBefore (newChild, refChild); }
+ void DOMCommentImpl::normalize() {fNode.normalize (); }
+ DOMNode* DOMCommentImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); }
DOMNode* DOMCommentImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fNode.replaceChild (newChild, oldChild); };
+ {return fNode.replaceChild (newChild, oldChild); }
bool DOMCommentImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMCommentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMCommentImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMCommentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMCommentImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMCommentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMCommentImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMCommentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMCommentImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }
void* DOMCommentImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMCommentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- const XMLCh* DOMCommentImpl::getBaseURI() const {return fNode.getBaseURI(); };
- short DOMCommentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMCommentImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMCommentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMCommentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMCommentImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMCommentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMCommentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMCommentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ const XMLCh* DOMCommentImpl::getBaseURI() const {return fNode.getBaseURI(); }
+ short DOMCommentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMCommentImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMCommentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMCommentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMCommentImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMCommentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMCommentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
@@ -212,19 +212,19 @@ DOMComment *DOMCommentImpl::splitText(XMLSize_t offset)
//
- const XMLCh* DOMCommentImpl::getData() const {return fCharacterData.getData();};
- XMLSize_t DOMCommentImpl::getLength() const {return fCharacterData.getLength();};
+ const XMLCh* DOMCommentImpl::getData() const {return fCharacterData.getData();}
+ XMLSize_t DOMCommentImpl::getLength() const {return fCharacterData.getLength();}
const XMLCh* DOMCommentImpl::substringData(XMLSize_t offset, XMLSize_t count) const
- {return fCharacterData.substringData(this, offset, count);};
- void DOMCommentImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
+ {return fCharacterData.substringData(this, offset, count);}
+ void DOMCommentImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);}
void DOMCommentImpl::insertData(XMLSize_t offset, const XMLCh *arg)
- {fCharacterData.insertData(this, offset, arg);};
+ {fCharacterData.insertData(this, offset, arg);}
void DOMCommentImpl::deleteData(XMLSize_t offset, XMLSize_t count)
- {fCharacterData.deleteData(this, offset, count);};
+ {fCharacterData.deleteData(this, offset, count);}
void DOMCommentImpl::replaceData(XMLSize_t offset, XMLSize_t count, const XMLCh *arg)
- {fCharacterData.replaceData(this, offset, count, arg);};
- void DOMCommentImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
- void DOMCommentImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+ {fCharacterData.replaceData(this, offset, count, arg);}
+ void DOMCommentImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);}
+ void DOMCommentImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMCommentImpl.hpp b/src/xercesc/dom/impl/DOMCommentImpl.hpp
index f75a19339e8d6c24715336814ef74fa64ac7e414..e559c90afe4d9f4dd18232c42864148a68c6ece6 100644
--- a/src/xercesc/dom/impl/DOMCommentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCommentImpl.hpp
@@ -110,6 +110,11 @@ public:
// Non standard extension for the range to work
DOMComment* splitText(XMLSize_t offset);
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMCommentImpl & operator = (const DOMCommentImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMConfigurationImpl.hpp b/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
index 0d7625fffd8c91f8d62daf0b6402b87521cebc61..c2ad7b8e32dc1b1f7b501b65548fa67a6b678d1f 100644
--- a/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMConfigurationImpl.hpp
@@ -81,10 +81,10 @@ class DOMDocumentImpl;
class CDOM_EXPORT DOMConfigurationImpl : public DOMConfiguration
{
-protected:
+private:
//unimplemented
- DOMConfigurationImpl(const DOMConfiguration &) {};
- DOMConfigurationImpl & operator = (const DOMConfiguration &) {return *this;};
+ DOMConfigurationImpl(const DOMConfiguration &);
+ DOMConfigurationImpl & operator = (const DOMConfiguration &);
public:
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp b/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
index b694c72dba714af28acfd6e624aea3064f522762..4f4860b8e24bb077527f0b8d1adf06e16e37f429 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
@@ -105,6 +105,11 @@ public:
private:
DOMNode* nextMatchingElementAfter(DOMNode *current);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMDeepNodeListImpl(const DOMDeepNodeListImpl &);
+ DOMDeepNodeListImpl & operator = (const DOMDeepNodeListImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp b/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
index c65a9dcb58f05bc996c6f850403e79b34c61c896..5713ce94c54d81d6ffa5022e2aa5779bb3c2603b 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
@@ -124,6 +124,8 @@ struct DOMDeepNodeListPoolTableBucketElem : public XMemory
void* fKey1;
XMLCh* fKey2;
XMLCh* fKey3;
+
+ ~DOMDeepNodeListPoolTableBucketElem() {};
};
@@ -193,6 +195,11 @@ private:
const DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal) const;
void initialize(const XMLSize_t modulus);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMDeepNodeListPool(const DOMDeepNodeListPool<TVal> &);
+ DOMDeepNodeListPool<TVal> & operator = (const DOMDeepNodeListPool<TVal> &);
// -----------------------------------------------------------------------
// Data members
diff --git a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
index a6dace68107de8963f5aa4937e9e0e1798ca98c1..9c6883f40f5d85e0f25891fc3cffcb5af6c9581c 100644
--- a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
@@ -71,7 +71,7 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMDocumentFragmentImpl::DOMDocumentFragmentImpl(DOMDocument *masterDoc)
: fNode(masterDoc), fParent(masterDoc)
{
-};
+}
DOMDocumentFragmentImpl::DOMDocumentFragmentImpl(const DOMDocumentFragmentImpl &other,
@@ -80,12 +80,12 @@ DOMDocumentFragmentImpl::DOMDocumentFragmentImpl(const DOMDocumentFragmentImpl &
{
if (deep)
castToParentImpl(this)->cloneChildren(&other);
-};
+}
DOMDocumentFragmentImpl::~DOMDocumentFragmentImpl()
{
-};
+}
@@ -94,7 +94,7 @@ DOMNode *DOMDocumentFragmentImpl::cloneNode(bool deep) const
DOMNode* newNode = new (castToNodeImpl(this)->getOwnerDocument(), DOMDocumentImpl::DOCUMENT_FRAGMENT_OBJECT) DOMDocumentFragmentImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMDocumentFragmentImpl::getNodeName() const {
@@ -107,13 +107,13 @@ const XMLCh * DOMDocumentFragmentImpl::getNodeName() const {
short DOMDocumentFragmentImpl::getNodeType() const {
return DOMNode::DOCUMENT_FRAGMENT_NODE;
-};
+}
void DOMDocumentFragmentImpl::setNodeValue(const XMLCh *x)
{
fNode.setNodeValue(x);
-};
+}
void DOMDocumentFragmentImpl::release()
@@ -136,43 +136,43 @@ void DOMDocumentFragmentImpl::release()
//
// Delegation stubs for inherited functions.
//
- DOMNode* DOMDocumentFragmentImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); };
- DOMNamedNodeMap* DOMDocumentFragmentImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMDocumentFragmentImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMDocumentFragmentImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMDocumentFragmentImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMDocumentFragmentImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMDocumentFragmentImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMDocumentFragmentImpl::getNextSibling() const {return fNode.getNextSibling (); };
- const XMLCh* DOMDocumentFragmentImpl::getNodeValue() const {return fNode.getNodeValue (); };
- DOMDocument* DOMDocumentFragmentImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMDocumentFragmentImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMDocumentFragmentImpl::getParentNode() const {return fNode.getParentNode (); };
- DOMNode* DOMDocumentFragmentImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); };
- bool DOMDocumentFragmentImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
+ DOMNode* DOMDocumentFragmentImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); }
+ DOMNamedNodeMap* DOMDocumentFragmentImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMDocumentFragmentImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMDocumentFragmentImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMDocumentFragmentImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMDocumentFragmentImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMDocumentFragmentImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMDocumentFragmentImpl::getNextSibling() const {return fNode.getNextSibling (); }
+ const XMLCh* DOMDocumentFragmentImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ DOMDocument* DOMDocumentFragmentImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMDocumentFragmentImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMDocumentFragmentImpl::getParentNode() const {return fNode.getParentNode (); }
+ DOMNode* DOMDocumentFragmentImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); }
+ bool DOMDocumentFragmentImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
DOMNode* DOMDocumentFragmentImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fParent.insertBefore (newChild, refChild); };
- void DOMDocumentFragmentImpl::normalize() {fParent.normalize (); };
- DOMNode* DOMDocumentFragmentImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); };
+ {return fParent.insertBefore (newChild, refChild); }
+ void DOMDocumentFragmentImpl::normalize() {fParent.normalize (); }
+ DOMNode* DOMDocumentFragmentImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); }
DOMNode* DOMDocumentFragmentImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fParent.replaceChild (newChild, oldChild); };
+ {return fParent.replaceChild (newChild, oldChild); }
bool DOMDocumentFragmentImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMDocumentFragmentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMDocumentFragmentImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMDocumentFragmentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMDocumentFragmentImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMDocumentFragmentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMDocumentFragmentImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMDocumentFragmentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMDocumentFragmentImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }
void* DOMDocumentFragmentImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMDocumentFragmentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- const XMLCh* DOMDocumentFragmentImpl::getBaseURI() const {return fNode.getBaseURI(); };
- short DOMDocumentFragmentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMDocumentFragmentImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMDocumentFragmentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMDocumentFragmentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMDocumentFragmentImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMDocumentFragmentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMDocumentFragmentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMDocumentFragmentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ const XMLCh* DOMDocumentFragmentImpl::getBaseURI() const {return fNode.getBaseURI(); }
+ short DOMDocumentFragmentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMDocumentFragmentImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMDocumentFragmentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMDocumentFragmentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMDocumentFragmentImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMDocumentFragmentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMDocumentFragmentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
index cae7039bf75148d335906fe41363d78688230bcd..1e31d91de702d5a3144762fb0d954cb1b26a9f07 100644
--- a/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDocumentFragmentImpl.hpp
@@ -91,6 +91,11 @@ private:
DOMDocumentFragmentImpl(const DOMDocumentFragmentImpl &other, bool deep);
friend class DOMDocumentImpl;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMDocumentFragmentImpl & operator = (const DOMDocumentFragmentImpl &);
+
public:
virtual ~DOMDocumentFragmentImpl();
diff --git a/src/xercesc/dom/impl/DOMDocumentImpl.cpp b/src/xercesc/dom/impl/DOMDocumentImpl.cpp
index feecda8d5b6a53831d77eb9879e533edafb1038e..5059db3984c5a1454913ccf2d233cd0c641fc553 100644
--- a/src/xercesc/dom/impl/DOMDocumentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDocumentImpl.cpp
@@ -103,32 +103,32 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMDocumentImpl::DOMDocumentImpl(MemoryManager* const manager)
: fNode(this),
fParent(this),
- fCurrentBlock(0),
- fDOMConfiguration(0),
- fFreePtr(0),
- fFreeBytesRemaining(0),
- fDocType(0),
- fDocElement(0),
- fNamePool(0),
- fNormalizer(0),
fNodeIDMap(0),
- fRanges(0),
- fNodeIterators(0),
- fChanges(0),
- fNodeListPool(0),
fActualEncoding(0),
fEncoding(0),
- fVersion(0),
fStandalone(false),
+ fVersion(0),
fDocumentURI(0),
+ fDOMConfiguration(0),
fUserDataTable(0),
+ fCurrentBlock(0),
+ fFreePtr(0),
+ fFreeBytesRemaining(0),
fRecycleNodePtr(0),
fRecycleBufferPtr(0),
+ fNodeListPool(0),
+ fDocType(0),
+ fDocElement(0),
+ fNamePool(0),
+ fNormalizer(0),
+ fRanges(0),
+ fNodeIterators(0),
fMemoryManager(manager),
+ fChanges(0),
errorChecking(true)
{
fNamePool = new (this) DOMStringPool(257, this);
-};
+}
//DOM Level 2
@@ -138,28 +138,28 @@ DOMDocumentImpl::DOMDocumentImpl(const XMLCh *fNamespaceURI,
MemoryManager* const manager)
: fNode(this),
fParent(this),
- fCurrentBlock(0),
- fDOMConfiguration(0),
- fFreePtr(0),
- fFreeBytesRemaining(0),
- fDocType(0),
- fDocElement(0),
- fNamePool(0),
- fNormalizer(0),
fNodeIDMap(0),
- fRanges(0),
- fNodeIterators(0),
- fChanges(0),
- fNodeListPool(0),
fActualEncoding(0),
fEncoding(0),
- fVersion(0),
fStandalone(false),
+ fVersion(0),
fDocumentURI(0),
+ fDOMConfiguration(0),
fUserDataTable(0),
+ fCurrentBlock(0),
+ fFreePtr(0),
+ fFreeBytesRemaining(0),
fRecycleNodePtr(0),
fRecycleBufferPtr(0),
+ fNodeListPool(0),
+ fDocType(0),
+ fDocElement(0),
+ fNamePool(0),
+ fNormalizer(0),
+ fRanges(0),
+ fNodeIterators(0),
fMemoryManager(manager),
+ fChanges(0),
errorChecking(true)
{
fNamePool = new (this) DOMStringPool(257, this);
@@ -233,7 +233,7 @@ DOMDocumentImpl::~DOMDocumentImpl()
// Delete the heap for this document. This uncerimoniously yanks the storage
// out from under all of the nodes in the document. Destructors are NOT called.
this->deleteHeap();
-};
+}
DOMNode *DOMDocumentImpl::cloneNode(bool deep) const {
@@ -251,7 +251,7 @@ DOMNode *DOMDocumentImpl::cloneNode(bool deep) const {
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newdoc);
return newdoc;
-};
+}
const XMLCh * DOMDocumentImpl::getNodeName() const {
@@ -263,7 +263,7 @@ const XMLCh * DOMDocumentImpl::getNodeName() const {
short DOMDocumentImpl::getNodeType() const {
return DOMNode::DOCUMENT_NODE;
-};
+}
// even though ownerDocument refers to this in this implementation
@@ -278,27 +278,27 @@ DOMAttr *DOMDocumentImpl::createAttribute(const XMLCh *nam)
if(!nam || !isXMLName(nam))
throw DOMException(DOMException::INVALID_CHARACTER_ERR,0);
return new (this, DOMDocumentImpl::ATTR_OBJECT) DOMAttrImpl(this,nam);
-};
+}
DOMCDATASection *DOMDocumentImpl::createCDATASection(const XMLCh *data) {
return new (this, DOMDocumentImpl::CDATA_SECTION_OBJECT) DOMCDATASectionImpl(this,data);
-};
+}
DOMComment *DOMDocumentImpl::createComment(const XMLCh *data)
{
return new (this, DOMDocumentImpl::COMMENT_OBJECT) DOMCommentImpl(this, data);
-};
+}
DOMDocumentFragment *DOMDocumentImpl::createDocumentFragment()
{
return new (this, DOMDocumentImpl::DOCUMENT_FRAGMENT_OBJECT) DOMDocumentFragmentImpl(this);
-};
+}
@@ -309,7 +309,7 @@ DOMDocumentType *DOMDocumentImpl::createDocumentType(const XMLCh *nam)
DOMException::INVALID_CHARACTER_ERR, 0);
return new (this, DOMDocumentImpl::DOCUMENT_TYPE_OBJECT) DOMDocumentTypeImpl(this, nam, false);
-};
+}
@@ -323,7 +323,7 @@ DOMDocumentType *
DOMException::INVALID_CHARACTER_ERR, 0);
return new (this, DOMDocumentImpl::DOCUMENT_TYPE_OBJECT) DOMDocumentTypeImpl(this, qualifiedName, publicId, systemId, false);
-};
+}
@@ -333,13 +333,13 @@ DOMElement *DOMDocumentImpl::createElement(const XMLCh *tagName)
throw DOMException(DOMException::INVALID_CHARACTER_ERR,0);
return new (this, DOMDocumentImpl::ELEMENT_OBJECT) DOMElementImpl(this,tagName);
-};
+}
DOMElement *DOMDocumentImpl::createElementNoCheck(const XMLCh *tagName)
{
return new (this, DOMDocumentImpl::ELEMENT_OBJECT) DOMElementImpl(this, tagName);
-};
+}
@@ -351,7 +351,7 @@ DOMEntity *DOMDocumentImpl::createEntity(const XMLCh *nam)
DOMException::INVALID_CHARACTER_ERR, 0);
return new (this, DOMDocumentImpl::ENTITY_OBJECT) DOMEntityImpl(this, nam);
-};
+}
@@ -362,7 +362,7 @@ DOMEntityReference *DOMDocumentImpl::createEntityReference(const XMLCh *nam)
DOMException::INVALID_CHARACTER_ERR, 0);
return new (this, DOMDocumentImpl::ENTITY_REFERENCE_OBJECT) DOMEntityReferenceImpl(this, nam);
-};
+}
DOMEntityReference *DOMDocumentImpl::createEntityReferenceByParser(const XMLCh *nam)
{
@@ -371,7 +371,7 @@ DOMEntityReference *DOMDocumentImpl::createEntityReferenceByParser(const XMLCh *
DOMException::INVALID_CHARACTER_ERR, 0);
return new (this, DOMDocumentImpl::ENTITY_REFERENCE_OBJECT) DOMEntityReferenceImpl(this, nam, false);
-};
+}
DOMNotation *DOMDocumentImpl::createNotation(const XMLCh *nam)
{
@@ -380,7 +380,7 @@ DOMNotation *DOMDocumentImpl::createNotation(const XMLCh *nam)
DOMException::INVALID_CHARACTER_ERR, 0);
return new (this, DOMDocumentImpl::NOTATION_OBJECT) DOMNotationImpl(this, nam);
-};
+}
@@ -390,7 +390,7 @@ DOMProcessingInstruction *DOMDocumentImpl::createProcessingInstruction(
if(!target || !isXMLName(target))
throw DOMException(DOMException::INVALID_CHARACTER_ERR,0);
return new (this, DOMDocumentImpl::PROCESSING_INSTRUCTION_OBJECT) DOMProcessingInstructionImpl(this,target,data);
-};
+}
@@ -398,7 +398,7 @@ DOMProcessingInstruction *DOMDocumentImpl::createProcessingInstruction(
DOMText *DOMDocumentImpl::createTextNode(const XMLCh *data)
{
return new (this, DOMDocumentImpl::TEXT_OBJECT) DOMTextImpl(this,data);
-};
+}
DOMNodeIterator* DOMDocumentImpl::createNodeIterator (
@@ -442,21 +442,21 @@ void DOMDocumentImpl::removeNodeIterator(DOMNodeIteratorImpl* nodeIterator)
}
-const DOMXPathExpression* DOMDocumentImpl::createExpression(const XMLCh *expression, const DOMXPathNSResolver *resolver)
+const DOMXPathExpression* DOMDocumentImpl::createExpression(const XMLCh *, const DOMXPathNSResolver *)
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
-const DOMXPathNSResolver* DOMDocumentImpl::createNSResolver(DOMNode *nodeResolver)
+const DOMXPathNSResolver* DOMDocumentImpl::createNSResolver(DOMNode *)
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
-void* DOMDocumentImpl::evaluate(const XMLCh *expression, DOMNode *contextNode, const DOMXPathNSResolver *resolver,
- unsigned short type, void* result)
+void* DOMDocumentImpl::evaluate(const XMLCh *, DOMNode *, const DOMXPathNSResolver *,
+ unsigned short, void* )
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
@@ -480,14 +480,14 @@ DOMTreeWalker* DOMDocumentImpl::createTreeWalker (DOMNode *root, unsigned long w
DOMDocumentType *DOMDocumentImpl::getDoctype() const
{
return fDocType;
-};
+}
DOMElement *DOMDocumentImpl::getDocumentElement() const
{
return fDocElement;
-};
+}
@@ -495,7 +495,7 @@ DOMNodeList *DOMDocumentImpl::getElementsByTagName(const XMLCh *tagname) const
{
// cast off the const of this because we will update the fNodeListPool
return ((DOMDocumentImpl*)this)->getDeepNodeList(this,tagname);
-};
+}
DOMImplementation *DOMDocumentImpl::getImplementation() const {
@@ -526,7 +526,7 @@ DOMNode *DOMDocumentImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
fDocType=(DOMDocumentType *)newChild;
return newChild;
-};
+}
DOMNode* DOMDocumentImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild) {
@@ -565,7 +565,7 @@ bool DOMDocumentImpl::isXMLName(const XMLCh *s)
return XMLChar1_1::isValidName(s, XMLString::stringLen(s));
else
return XMLChar1_0::isValidName(s, XMLString::stringLen(s));
-};
+}
@@ -581,14 +581,14 @@ DOMNode *DOMDocumentImpl::removeChild(DOMNode *oldChild)
fDocType=0;
return oldChild;
-};
+}
void DOMDocumentImpl::setNodeValue(const XMLCh *x)
{
fNode.setNodeValue(x);
-};
+}
//Introduced in DOM Level 2
@@ -671,7 +671,7 @@ int DOMDocumentImpl::indexofQualifiedName(const XMLCh * qName)
const XMLCh* DOMDocumentImpl::getBaseURI() const
{
return fDocumentURI;
-};
+}
DOMRange* DOMDocumentImpl::createRange()
@@ -746,7 +746,7 @@ bool DOMDocumentImpl::isKidOK(DOMNode *parent, DOMNode *child)
kidOK[DOMNode::CDATA_SECTION_NODE] =
kidOK[DOMNode::NOTATION_NODE] =
0;
- };
+ }
int p=parent->getNodeType();
int ch = child->getNodeType();
return (kidOK[p] & 1<<ch) != 0;
@@ -760,43 +760,43 @@ void DOMDocumentImpl::changed()
int DOMDocumentImpl::changes() const{
return fChanges;
-};
+}
//
// Delegation for functions inherited from DOMNode
//
- DOMNode* DOMDocumentImpl::appendChild(DOMNode *newChild) {return insertBefore(newChild, 0); };
- DOMNamedNodeMap* DOMDocumentImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMDocumentImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMDocumentImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMDocumentImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMDocumentImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMDocumentImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMDocumentImpl::getNextSibling() const {return fNode.getNextSibling (); };
- const XMLCh* DOMDocumentImpl::getNodeValue() const {return fNode.getNodeValue (); };
- const XMLCh* DOMDocumentImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMDocumentImpl::getParentNode() const {return fNode.getParentNode (); };
- DOMNode* DOMDocumentImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); };
- bool DOMDocumentImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
- void DOMDocumentImpl::normalize() {fParent.normalize (); };
+ DOMNode* DOMDocumentImpl::appendChild(DOMNode *newChild) {return insertBefore(newChild, 0); }
+ DOMNamedNodeMap* DOMDocumentImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMDocumentImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMDocumentImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMDocumentImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMDocumentImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMDocumentImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMDocumentImpl::getNextSibling() const {return fNode.getNextSibling (); }
+ const XMLCh* DOMDocumentImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ const XMLCh* DOMDocumentImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMDocumentImpl::getParentNode() const {return fNode.getParentNode (); }
+ DOMNode* DOMDocumentImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); }
+ bool DOMDocumentImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
+ void DOMDocumentImpl::normalize() {fParent.normalize (); }
bool DOMDocumentImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMDocumentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMDocumentImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMDocumentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other);};
- bool DOMDocumentImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg);};
+ {return fNode.isSupported (feature, version); }
+ void DOMDocumentImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMDocumentImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMDocumentImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other);}
+ bool DOMDocumentImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg);}
void* DOMDocumentImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMDocumentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- short DOMDocumentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMDocumentImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMDocumentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMDocumentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMDocumentImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMDocumentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMDocumentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMDocumentImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ short DOMDocumentImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMDocumentImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMDocumentImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMDocumentImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMDocumentImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMDocumentImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMDocumentImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
@@ -1007,7 +1007,7 @@ void DOMDocumentImpl::setStrictErrorChecking(bool strictErrorChecking) {
setErrorChecking(strictErrorChecking);
}
-DOMNode* DOMDocumentImpl::adoptNode(DOMNode* source) {
+DOMNode* DOMDocumentImpl::adoptNode(DOMNode*) {
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
diff --git a/src/xercesc/dom/impl/DOMDocumentImpl.hpp b/src/xercesc/dom/impl/DOMDocumentImpl.hpp
index 06f9a0c5a9c6964f08f57380015e98aa2523e9a5..08bda4750f0e59f143cd1bcc077f64094208c1f5 100644
--- a/src/xercesc/dom/impl/DOMDocumentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDocumentImpl.hpp
@@ -327,6 +327,12 @@ private:
//Internal helper functions
virtual DOMNode* importNode(DOMNode *source, bool deep, bool cloningNode);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMDocumentImpl(const DOMDocumentImpl &);
+ DOMDocumentImpl & operator = (const DOMDocumentImpl &);
+
private:
// -----------------------------------------------------------------------
// data
diff --git a/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp b/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
index 921a3a1dbc280a1bee81bdf83054b493f1c22321..a7118fc9ad73958fbe77ece3f5f7b4b36e6e7e2a 100644
--- a/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
@@ -116,14 +116,14 @@ DOMDocumentTypeImpl::DOMDocumentTypeImpl(DOMDocument *ownerDoc,
bool heap)
: fNode(ownerDoc),
fParent(ownerDoc),
- fPublicId(0),
- fSystemId(0),
fName(0),
- fIntSubsetReading(false),
fEntities(0),
fNotations(0),
fElements(0),
+ fPublicId(0),
+ fSystemId(0),
fInternalSubset(0),
+ fIntSubsetReading(false),
fIsCreatedFromHeap(heap)
{
if (ownerDoc) {
@@ -139,7 +139,7 @@ DOMDocumentTypeImpl::DOMDocumentTypeImpl(DOMDocument *ownerDoc,
fNotations= new (doc) DOMNamedNodeMapImpl(this);
fElements = new (doc) DOMNamedNodeMapImpl(this);
}
-};
+}
//Introduced in DOM Level 2
@@ -150,14 +150,14 @@ DOMDocumentTypeImpl::DOMDocumentTypeImpl(DOMDocument *ownerDoc,
bool heap)
: fNode(ownerDoc),
fParent(ownerDoc),
- fPublicId(0),
- fSystemId(0),
fName(0),
- fIntSubsetReading(false),
fEntities(0),
fNotations(0),
fElements(0),
- fInternalSubset(0),
+ fPublicId(0),
+ fSystemId(0),
+ fInternalSubset(0),
+ fIntSubsetReading(false),
fIsCreatedFromHeap(heap)
{
int index = DOMDocumentImpl::indexofQualifiedName(qualifiedName);
@@ -213,21 +213,21 @@ DOMDocumentTypeImpl::DOMDocumentTypeImpl(DOMDocument *ownerDoc,
fNotations= new (doc) DOMNamedNodeMapImpl(this);
fElements = new (doc) DOMNamedNodeMapImpl(this);
}
-};
+}
DOMDocumentTypeImpl::DOMDocumentTypeImpl(const DOMDocumentTypeImpl &other, bool heap, bool deep)
: fNode(other.fNode),
fParent(other.fParent),
fChild(other.fChild),
- fPublicId(0),
- fSystemId(0),
fName(0),
- fIntSubsetReading(other.fIntSubsetReading),
fEntities(0),
fNotations(0),
fElements(0),
+ fPublicId(0),
+ fSystemId(0),
fInternalSubset(0),
+ fIntSubsetReading(other.fIntSubsetReading),
fIsCreatedFromHeap(heap)
{
fName = other.fName;
@@ -299,43 +299,43 @@ void DOMDocumentTypeImpl::setOwnerDocument(DOMDocument *doc) {
const XMLCh * DOMDocumentTypeImpl::getNodeName() const
{
return fName;
-};
+}
short DOMDocumentTypeImpl::getNodeType() const {
return DOMNode::DOCUMENT_TYPE_NODE;
-};
+}
DOMNamedNodeMap *DOMDocumentTypeImpl::getEntities() const
{
return fEntities;
-};
+}
const XMLCh * DOMDocumentTypeImpl::getName() const
{
return fName;
-};
+}
DOMNamedNodeMap *DOMDocumentTypeImpl::getNotations() const
{
return fNotations;
-};
+}
DOMNamedNodeMap *DOMDocumentTypeImpl::getElements() const
{
return fElements;
-};
+}
void DOMDocumentTypeImpl::setNodeValue(const XMLCh *val)
{
fNode.setNodeValue(val);
-};
+}
void DOMDocumentTypeImpl::setReadOnly(bool readOnl, bool deep)
@@ -345,7 +345,7 @@ void DOMDocumentTypeImpl::setReadOnly(bool readOnl, bool deep)
((DOMNamedNodeMapImpl *)fEntities)->setReadOnly(readOnl,true);
if (fNotations)
((DOMNamedNodeMapImpl *)fNotations)->setReadOnly(readOnl,true);
-};
+}
//Introduced in DOM Level 2
@@ -444,42 +444,42 @@ void DOMDocumentTypeImpl::release()
// Delegation for functions inherited from Node
//
- DOMNode* DOMDocumentTypeImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); };
- DOMNamedNodeMap* DOMDocumentTypeImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMDocumentTypeImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMDocumentTypeImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMDocumentTypeImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMDocumentTypeImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMDocumentTypeImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMDocumentTypeImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMDocumentTypeImpl::getNodeValue() const {return fNode.getNodeValue (); };
- DOMDocument* DOMDocumentTypeImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMDocumentTypeImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMDocumentTypeImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMDocumentTypeImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMDocumentTypeImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
+ DOMNode* DOMDocumentTypeImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); }
+ DOMNamedNodeMap* DOMDocumentTypeImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMDocumentTypeImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMDocumentTypeImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMDocumentTypeImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMDocumentTypeImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMDocumentTypeImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMDocumentTypeImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMDocumentTypeImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ DOMDocument* DOMDocumentTypeImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMDocumentTypeImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMDocumentTypeImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMDocumentTypeImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMDocumentTypeImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
DOMNode* DOMDocumentTypeImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fParent.insertBefore (newChild, refChild); };
- void DOMDocumentTypeImpl::normalize() {fParent.normalize (); };
- DOMNode* DOMDocumentTypeImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); };
+ {return fParent.insertBefore (newChild, refChild); }
+ void DOMDocumentTypeImpl::normalize() {fParent.normalize (); }
+ DOMNode* DOMDocumentTypeImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); }
DOMNode* DOMDocumentTypeImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fParent.replaceChild (newChild, oldChild); };
+ {return fParent.replaceChild (newChild, oldChild); }
bool DOMDocumentTypeImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMDocumentTypeImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMDocumentTypeImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMDocumentTypeImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
+ {return fNode.isSupported (feature, version); }
+ void DOMDocumentTypeImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMDocumentTypeImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMDocumentTypeImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
void* DOMDocumentTypeImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMDocumentTypeImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- const XMLCh* DOMDocumentTypeImpl::getBaseURI() const {return fNode.getBaseURI(); };
- short DOMDocumentTypeImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMDocumentTypeImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMDocumentTypeImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMDocumentTypeImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMDocumentTypeImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMDocumentTypeImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMDocumentTypeImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMDocumentTypeImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ const XMLCh* DOMDocumentTypeImpl::getBaseURI() const {return fNode.getBaseURI(); }
+ short DOMDocumentTypeImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMDocumentTypeImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMDocumentTypeImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMDocumentTypeImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMDocumentTypeImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMDocumentTypeImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMDocumentTypeImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
bool DOMDocumentTypeImpl::isEqualNode(const DOMNode* arg) const
@@ -572,7 +572,7 @@ bool DOMDocumentTypeImpl::isEqualNode(const DOMNode* arg) const
}
return fParent.isEqualNode(arg);
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp b/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
index a2aba813bb017937bf44d9f606d65c0a9707241d..b27a9dbaeea89844ba7c47864872bcf2fb30ca1a 100644
--- a/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDocumentTypeImpl.hpp
@@ -132,6 +132,12 @@ public:
virtual const XMLCh * getPublicId() const;
virtual const XMLCh * getSystemId() const;
virtual const XMLCh * getInternalSubset() const;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMDocumentTypeImpl & operator = (const DOMDocumentTypeImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMElementImpl.cpp b/src/xercesc/dom/impl/DOMElementImpl.cpp
index f976d561b2e4e99c32486138f2473b35f76a4551..2b7626d40e9b0e19c1664a2be597b0f85604cb3f 100644
--- a/src/xercesc/dom/impl/DOMElementImpl.cpp
+++ b/src/xercesc/dom/impl/DOMElementImpl.cpp
@@ -98,15 +98,15 @@ DOMElementImpl::DOMElementImpl(DOMDocument *ownerDoc, const XMLCh *eName)
else {
fAttributes = new (getOwnerDocument()) DOMAttrMapImpl(this, fDefaultAttributes);
}
-};
+}
DOMElementImpl::DOMElementImpl(const DOMElementImpl &other, bool deep)
: fNode(other.getOwnerDocument()),
fParent(other.getOwnerDocument()),
- fSchemaType(other.fSchemaType),
fAttributes(0),
- fDefaultAttributes(0)
+ fDefaultAttributes(0),
+ fSchemaType(other.fSchemaType)
{
fName = other.fName;
@@ -138,12 +138,12 @@ DOMElementImpl::DOMElementImpl(const DOMElementImpl &other, bool deep)
}
}
-};
+}
DOMElementImpl::~DOMElementImpl()
{
-};
+}
DOMNode *DOMElementImpl::cloneNode(bool deep) const
@@ -151,19 +151,19 @@ DOMNode *DOMElementImpl::cloneNode(bool deep) const
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::ELEMENT_OBJECT) DOMElementImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMElementImpl::getNodeName() const {
return fName;
-};
+}
short DOMElementImpl::getNodeType() const {
return DOMNode::ELEMENT_NODE;
-};
+}
const XMLCh * DOMElementImpl::getAttribute(const XMLCh *nam) const
@@ -173,21 +173,21 @@ const XMLCh * DOMElementImpl::getAttribute(const XMLCh *nam) const
return attr->getNodeValue();
return XMLUni::fgZeroLenString;
-};
+}
DOMAttr *DOMElementImpl::getAttributeNode(const XMLCh *nam) const
{
return (DOMAttr *)fAttributes->getNamedItem(nam);
-};
+}
DOMNamedNodeMap *DOMElementImpl::getAttributes() const
{
DOMElementImpl *ncThis = (DOMElementImpl *)this; // cast off const
return ncThis->fAttributes;
-};
+}
@@ -195,7 +195,7 @@ DOMNodeList *DOMElementImpl::getElementsByTagName(const XMLCh *tagname) const
{
DOMDocumentImpl *docImpl = (DOMDocumentImpl *)getOwnerDocument();
return docImpl->getDeepNodeList(this,tagname);
-};
+}
const XMLCh * DOMElementImpl::getTagName() const
@@ -217,7 +217,7 @@ void DOMElementImpl::removeAttribute(const XMLCh *nam)
((DOMAttrImpl *)att)->removeAttrFromIDNodeMap();
att->release();
}
-};
+}
@@ -252,7 +252,7 @@ DOMAttr *DOMElementImpl::removeAttributeNode(DOMAttr *oldAttr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0);
return (DOMAttr *)found;
-};
+}
@@ -270,7 +270,7 @@ void DOMElementImpl::setAttribute(const XMLCh *nam, const XMLCh *val)
}
newAttr->setNodeValue(val);
-};
+}
void DOMElementImpl::setIdAttribute(const XMLCh* name)
{
@@ -284,7 +284,7 @@ void DOMElementImpl::setIdAttribute(const XMLCh* name)
throw DOMException(DOMException::NOT_FOUND_ERR, 0);
((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
-};
+}
void DOMElementImpl::setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* localName) {
@@ -299,7 +299,7 @@ void DOMElementImpl::setIdAttributeNS(const XMLCh* namespaceURI, const XMLCh* lo
((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
-};
+}
void DOMElementImpl::setIdAttributeNode(const DOMAttr *idAttr) {
@@ -319,7 +319,7 @@ void DOMElementImpl::setIdAttributeNode(const DOMAttr *idAttr) {
throw DOMException(DOMException::NOT_FOUND_ERR, 0);
((DOMAttrImpl *)attr)->addAttrToIDNodeMap();
-};
+}
DOMAttr * DOMElementImpl::setAttributeNode(DOMAttr *newAttr)
@@ -336,13 +336,13 @@ DOMAttr * DOMElementImpl::setAttributeNode(DOMAttr *newAttr)
DOMAttr *oldAttr = (DOMAttr *) fAttributes->setNamedItem(newAttr);
return oldAttr;
-};
+}
void DOMElementImpl::setNodeValue(const XMLCh *x)
{
fNode.setNodeValue(x);
-};
+}
@@ -350,7 +350,7 @@ void DOMElementImpl::setReadOnly(bool readOnl, bool deep)
{
fNode.setReadOnly(readOnl,deep);
fAttributes->setReadOnly(readOnl,true);
-};
+}
//Introduced in DOM Level 2
@@ -424,27 +424,27 @@ DOMAttr *DOMElementImpl::setAttributeNodeNS(DOMAttr *newAttr)
DOMNodeList *DOMElementImpl::getElementsByTagNameNS(const XMLCh *namespaceURI,
const XMLCh *localName) const
{
- DOMDocumentImpl *docImpl = (DOMDocumentImpl *)getOwnerDocument();;
+ DOMDocumentImpl *docImpl = (DOMDocumentImpl *)getOwnerDocument();
return docImpl->getDeepNodeList(this, namespaceURI, localName);
}
bool DOMElementImpl::hasAttributes() const
{
return (fAttributes != 0 && fAttributes->getLength() != 0);
-};
+}
bool DOMElementImpl::hasAttribute(const XMLCh *name) const
{
return (getAttributeNode(name) != 0);
-};
+}
bool DOMElementImpl::hasAttributeNS(const XMLCh *namespaceURI,
const XMLCh *localName) const
{
return (getAttributeNodeNS(namespaceURI, localName) != 0);
-};
+}
// util functions for default attributes
@@ -483,7 +483,7 @@ DOMAttr * DOMElementImpl::setDefaultAttributeNode(DOMAttr *newAttr)
fAttributes->hasDefaults(true);
return oldAttr;
-};
+}
DOMAttr *DOMElementImpl::setDefaultAttributeNodeNS(DOMAttr *newAttr)
@@ -556,39 +556,39 @@ const XMLCh* DOMElementImpl::getBaseURI() const
//
// Functions inherited from Node
//
- DOMNode* DOMElementImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); };
- DOMNodeList* DOMElementImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMElementImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMElementImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMElementImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMElementImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMElementImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMElementImpl::getNodeValue() const {return fNode.getNodeValue (); };
- DOMDocument* DOMElementImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMElementImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMElementImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMElementImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMElementImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
+ DOMNode* DOMElementImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); }
+ DOMNodeList* DOMElementImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMElementImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMElementImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMElementImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMElementImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMElementImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMElementImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ DOMDocument* DOMElementImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMElementImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMElementImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMElementImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMElementImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
DOMNode* DOMElementImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fParent.insertBefore (newChild, refChild); };
- void DOMElementImpl::normalize() {fParent.normalize (); };
- DOMNode* DOMElementImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); };
+ {return fParent.insertBefore (newChild, refChild); }
+ void DOMElementImpl::normalize() {fParent.normalize (); }
+ DOMNode* DOMElementImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); }
DOMNode* DOMElementImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fParent.replaceChild (newChild, oldChild); };
+ {return fParent.replaceChild (newChild, oldChild); }
bool DOMElementImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMElementImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMElementImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
+ {return fNode.isSupported (feature, version); }
+ void DOMElementImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMElementImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
void* DOMElementImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMElementImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- short DOMElementImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMElementImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMElementImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMElementImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMElementImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMElementImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMElementImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMElementImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ short DOMElementImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMElementImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMElementImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMElementImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMElementImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMElementImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMElementImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
@@ -635,7 +635,7 @@ bool DOMElementImpl::isEqualNode(const DOMNode* arg) const
}
return fParent.isEqualNode(arg);
-};
+}
DOMNode* DOMElementImpl::rename(const XMLCh* namespaceURI, const XMLCh* name)
{
diff --git a/src/xercesc/dom/impl/DOMElementImpl.hpp b/src/xercesc/dom/impl/DOMElementImpl.hpp
index 24b717b8dc6b6ba1e6480ead027daec821dc0429..3503fb61b0c09a3f7da8746176acf8f7bae3468b 100644
--- a/src/xercesc/dom/impl/DOMElementImpl.hpp
+++ b/src/xercesc/dom/impl/DOMElementImpl.hpp
@@ -163,6 +163,11 @@ protected:
// default attribute helper functions
virtual void setupDefaultAttributes();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMElementImpl & operator = (const DOMElementImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMElementNSImpl.cpp b/src/xercesc/dom/impl/DOMElementNSImpl.cpp
index 2d68887d6567ef62200b3d55ac7af769a343a58a..70247a4de7f5a57333f8f411e0fe4ab9ca4da247 100644
--- a/src/xercesc/dom/impl/DOMElementNSImpl.cpp
+++ b/src/xercesc/dom/impl/DOMElementNSImpl.cpp
@@ -91,7 +91,7 @@ DOMElementNSImpl::DOMElementNSImpl(const DOMElementNSImpl &other, bool deep) :
this->fNamespaceURI = other.fNamespaceURI; //DOM Level 2
this->fLocalName = other.fLocalName; //DOM Level 2
this->fPrefix = other.fPrefix;
-};
+}
DOMNode * DOMElementNSImpl::cloneNode(bool deep) const {
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::ELEMENT_NS_OBJECT) DOMElementNSImpl(*this, deep);
@@ -273,7 +273,7 @@ void DOMElementNSImpl::setName(const XMLCh *namespaceURI,
DOMNode::ELEMENT_NODE
);
this -> fNamespaceURI = (URI == 0) ? 0 : ownerDoc->getPooledString(URI);
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMElementNSImpl.hpp b/src/xercesc/dom/impl/DOMElementNSImpl.hpp
index 9d6b3700b771d5fa95ce8936f73c97fd65001f2c..6c60aae73eea0395ff00bd8de237fbf7bbde3007 100644
--- a/src/xercesc/dom/impl/DOMElementNSImpl.hpp
+++ b/src/xercesc/dom/impl/DOMElementNSImpl.hpp
@@ -104,6 +104,12 @@ public:
// helper function for DOM Level 3 renameNode
virtual DOMNode* rename(const XMLCh* namespaceURI, const XMLCh* name);
void setName(const XMLCh* namespaceURI, const XMLCh* name);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMElementNSImpl & operator = (const DOMElementNSImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMEntityImpl.cpp b/src/xercesc/dom/impl/DOMEntityImpl.cpp
index a1e6da4e8e56fa622cd175a410e2867d53183454..34c9ca7d9b077b93c6ed3eb324c2bd18af1b9e7c 100644
--- a/src/xercesc/dom/impl/DOMEntityImpl.cpp
+++ b/src/xercesc/dom/impl/DOMEntityImpl.cpp
@@ -72,41 +72,41 @@ DOMEntityImpl::DOMEntityImpl(DOMDocument *ownerDoc, const XMLCh *eName)
fParent(ownerDoc),
fPublicId(0),
fSystemId(0),
+ fNotationName(0),
+ fRefEntity(0),
fActualEncoding(0),
fEncoding(0),
- fVersion(0),
- fEntityRefNodeCloned(false),
- fBaseURI(0)
-{
- fRefEntity = 0;
+ fVersion(0),
+ fBaseURI(0),
+ fEntityRefNodeCloned(false)
+{
fName = ((DOMDocumentImpl *)ownerDoc)->getPooledString(eName);
fNode.setReadOnly(true, true);
-};
+}
DOMEntityImpl::DOMEntityImpl(const DOMEntityImpl &other, bool deep)
: fNode(other.fNode),
fParent(other.fParent),
+ fName(other.fName),
+ fPublicId(other.fPublicId),
+ fSystemId(other.fSystemId),
+ fNotationName(other.fNotationName),
+ fRefEntity(other.fRefEntity),
fActualEncoding(other.fActualEncoding),
fEncoding(other.fEncoding),
fVersion(other.fVersion),
+ fBaseURI(other.fBaseURI),
fEntityRefNodeCloned(false)
-{
- fName = other.fName;
+{
if (deep)
- fParent.cloneChildren(&other);
- fPublicId = other.fPublicId;
- fSystemId = other.fSystemId;
- fNotationName = other.fNotationName;
- fBaseURI = other.fBaseURI;
-
- fRefEntity = other.fRefEntity;
+ fParent.cloneChildren(&other);
fNode.setReadOnly(true, true);
-};
+}
DOMEntityImpl::~DOMEntityImpl() {
-};
+}
DOMNode *DOMEntityImpl::cloneNode(bool deep) const
@@ -114,34 +114,34 @@ DOMNode *DOMEntityImpl::cloneNode(bool deep) const
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::ENTITY_OBJECT) DOMEntityImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMEntityImpl::getNodeName() const {
return fName;
-};
+}
short DOMEntityImpl::getNodeType() const {
return DOMNode::ENTITY_NODE;
-};
+}
const XMLCh * DOMEntityImpl::getNotationName() const
{
return fNotationName;
-};
+}
const XMLCh * DOMEntityImpl::getPublicId() const {
return fPublicId;
-};
+}
const XMLCh * DOMEntityImpl::getSystemId() const
{
return fSystemId;
-};
+}
const XMLCh* DOMEntityImpl::getBaseURI() const
@@ -153,7 +153,7 @@ const XMLCh* DOMEntityImpl::getBaseURI() const
void DOMEntityImpl::setNodeValue(const XMLCh *arg)
{
fNode.setNodeValue(arg);
-};
+}
void DOMEntityImpl::setNotationName(const XMLCh *arg)
@@ -226,7 +226,7 @@ DOMNode * DOMEntityImpl::getFirstChild() const
{
cloneEntityRefTree();
return fParent.fFirstChild;
-};
+}
DOMNode * DOMEntityImpl::getLastChild() const
{
@@ -269,38 +269,38 @@ void DOMEntityImpl::release()
// Functions inherited from Node
//
- DOMNode* DOMEntityImpl::appendChild(DOMNode *newChild) {cloneEntityRefTree(); return fParent.appendChild (newChild); };
- DOMNamedNodeMap* DOMEntityImpl::getAttributes() const {return fNode.getAttributes (); };
- const XMLCh* DOMEntityImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMEntityImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMEntityImpl::getNextSibling() const {return fNode.getNextSibling (); };
- const XMLCh* DOMEntityImpl::getNodeValue() const {return fNode.getNodeValue (); };
- DOMDocument* DOMEntityImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMEntityImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMEntityImpl::getParentNode() const {return fNode.getParentNode (); };
- DOMNode* DOMEntityImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); };
+ DOMNode* DOMEntityImpl::appendChild(DOMNode *newChild) {cloneEntityRefTree(); return fParent.appendChild (newChild); }
+ DOMNamedNodeMap* DOMEntityImpl::getAttributes() const {return fNode.getAttributes (); }
+ const XMLCh* DOMEntityImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMEntityImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMEntityImpl::getNextSibling() const {return fNode.getNextSibling (); }
+ const XMLCh* DOMEntityImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ DOMDocument* DOMEntityImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMEntityImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMEntityImpl::getParentNode() const {return fNode.getParentNode (); }
+ DOMNode* DOMEntityImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); }
DOMNode* DOMEntityImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {cloneEntityRefTree(); return fParent.insertBefore (newChild, refChild); };
- void DOMEntityImpl::normalize() {cloneEntityRefTree(); fParent.normalize (); };
- DOMNode* DOMEntityImpl::removeChild(DOMNode *oldChild) {cloneEntityRefTree(); return fParent.removeChild (oldChild); };
+ {cloneEntityRefTree(); return fParent.insertBefore (newChild, refChild); }
+ void DOMEntityImpl::normalize() {cloneEntityRefTree(); fParent.normalize (); }
+ DOMNode* DOMEntityImpl::removeChild(DOMNode *oldChild) {cloneEntityRefTree(); return fParent.removeChild (oldChild); }
DOMNode* DOMEntityImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {cloneEntityRefTree(); return fParent.replaceChild (newChild, oldChild); };
+ {cloneEntityRefTree(); return fParent.replaceChild (newChild, oldChild); }
bool DOMEntityImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMEntityImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMEntityImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMEntityImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMEntityImpl::isEqualNode(const DOMNode* arg) const {cloneEntityRefTree(); return fParent.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMEntityImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMEntityImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMEntityImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMEntityImpl::isEqualNode(const DOMNode* arg) const {cloneEntityRefTree(); return fParent.isEqualNode(arg); }
void* DOMEntityImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMEntityImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- short DOMEntityImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMEntityImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMEntityImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMEntityImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMEntityImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMEntityImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMEntityImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMEntityImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ short DOMEntityImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMEntityImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMEntityImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMEntityImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMEntityImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMEntityImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMEntityImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
//Introduced in DOM Level 3
diff --git a/src/xercesc/dom/impl/DOMEntityImpl.hpp b/src/xercesc/dom/impl/DOMEntityImpl.hpp
index 83a9446a1061ea3230cb45bef9e5e0635895f5a9..9ac4e0bb4b6682a1d521b6bb4b8fb27a737bd327 100644
--- a/src/xercesc/dom/impl/DOMEntityImpl.hpp
+++ b/src/xercesc/dom/impl/DOMEntityImpl.hpp
@@ -130,6 +130,12 @@ public:
virtual const XMLCh* getVersion() const;
virtual void setVersion(const XMLCh* version);
virtual void setBaseURI(const XMLCh *arg);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMEntityImpl & operator = (const DOMEntityImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp b/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
index 0b626f520b07ce84d05ea83f7cef1ef2e97d4344..6433c913bc029be969800aa556b132b434bc71aa 100644
--- a/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
+++ b/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
@@ -130,10 +130,8 @@ DOMEntityReferenceImpl::DOMEntityReferenceImpl(DOMDocument *ownerDoc,
DOMEntityReferenceImpl::DOMEntityReferenceImpl(const DOMEntityReferenceImpl &other,
bool deep)
- : fNode(other.fNode), fParent(other.fParent), fChild(other.fChild)
-{
- fName = other.fName;
- fBaseURI = other.fBaseURI;
+ : fNode(other.fNode), fParent(other.fParent), fChild(other.fChild), fName(other.fName), fBaseURI(other.fBaseURI)
+{
if (deep)
fParent.cloneChildren(&other);
fNode.setReadOnly(true, true);
@@ -156,12 +154,12 @@ DOMNode *DOMEntityReferenceImpl::cloneNode(bool deep) const
const XMLCh * DOMEntityReferenceImpl::getNodeName() const
{
return fName;
-};
+}
short DOMEntityReferenceImpl::getNodeType() const {
return DOMNode::ENTITY_REFERENCE_NODE;
-};
+}
@@ -220,42 +218,42 @@ const XMLCh* DOMEntityReferenceImpl::getBaseURI() const
//
- DOMNode* DOMEntityReferenceImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); };
- DOMNamedNodeMap* DOMEntityReferenceImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMEntityReferenceImpl::getChildNodes() const {return fParent.getChildNodes (); };
- DOMNode* DOMEntityReferenceImpl::getFirstChild() const {return fParent.getFirstChild (); };
- DOMNode* DOMEntityReferenceImpl::getLastChild() const {return fParent.getLastChild (); };
- const XMLCh* DOMEntityReferenceImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMEntityReferenceImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMEntityReferenceImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMEntityReferenceImpl::getNodeValue() const {return fNode.getNodeValue (); };
- DOMDocument* DOMEntityReferenceImpl::getOwnerDocument() const {return fParent.fOwnerDocument; };
- const XMLCh* DOMEntityReferenceImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMEntityReferenceImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMEntityReferenceImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMEntityReferenceImpl::hasChildNodes() const {return fParent.hasChildNodes (); };
+ DOMNode* DOMEntityReferenceImpl::appendChild(DOMNode *newChild) {return fParent.appendChild (newChild); }
+ DOMNamedNodeMap* DOMEntityReferenceImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMEntityReferenceImpl::getChildNodes() const {return fParent.getChildNodes (); }
+ DOMNode* DOMEntityReferenceImpl::getFirstChild() const {return fParent.getFirstChild (); }
+ DOMNode* DOMEntityReferenceImpl::getLastChild() const {return fParent.getLastChild (); }
+ const XMLCh* DOMEntityReferenceImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMEntityReferenceImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMEntityReferenceImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMEntityReferenceImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ DOMDocument* DOMEntityReferenceImpl::getOwnerDocument() const {return fParent.fOwnerDocument; }
+ const XMLCh* DOMEntityReferenceImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMEntityReferenceImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMEntityReferenceImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMEntityReferenceImpl::hasChildNodes() const {return fParent.hasChildNodes (); }
DOMNode* DOMEntityReferenceImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fParent.insertBefore (newChild, refChild); };
- void DOMEntityReferenceImpl::normalize() {fParent.normalize (); };
- DOMNode* DOMEntityReferenceImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); };
+ {return fParent.insertBefore (newChild, refChild); }
+ void DOMEntityReferenceImpl::normalize() {fParent.normalize (); }
+ DOMNode* DOMEntityReferenceImpl::removeChild(DOMNode *oldChild) {return fParent.removeChild (oldChild); }
DOMNode* DOMEntityReferenceImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fParent.replaceChild (newChild, oldChild); };
+ {return fParent.replaceChild (newChild, oldChild); }
bool DOMEntityReferenceImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMEntityReferenceImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMEntityReferenceImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMEntityReferenceImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMEntityReferenceImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMEntityReferenceImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMEntityReferenceImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMEntityReferenceImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMEntityReferenceImpl::isEqualNode(const DOMNode* arg) const {return fParent.isEqualNode(arg); }
void* DOMEntityReferenceImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMEntityReferenceImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- short DOMEntityReferenceImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMEntityReferenceImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMEntityReferenceImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMEntityReferenceImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMEntityReferenceImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMEntityReferenceImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMEntityReferenceImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMEntityReferenceImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ short DOMEntityReferenceImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMEntityReferenceImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMEntityReferenceImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMEntityReferenceImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMEntityReferenceImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMEntityReferenceImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMEntityReferenceImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp b/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
index a2100e2b05ae55032a9b108a03a3bab1a201ac2b..98420a09aea47782491dd55e67edc90f11d22a40 100644
--- a/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
+++ b/src/xercesc/dom/impl/DOMEntityReferenceImpl.hpp
@@ -102,6 +102,12 @@ public:
DOMNODE_FUNCTIONS;
virtual void setReadOnly(bool readOnly,bool deep);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMEntityReferenceImpl & operator = (const DOMEntityReferenceImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMErrorImpl.cpp b/src/xercesc/dom/impl/DOMErrorImpl.cpp
index 4ecb55a192618b0076ee351c87b9353349f7efed..460fa37d18e5e280c82ecc76c8bc4c0916fdcc4c 100644
--- a/src/xercesc/dom/impl/DOMErrorImpl.cpp
+++ b/src/xercesc/dom/impl/DOMErrorImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:44:26 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/02 14:33:13 amassari
* Don't use the word "exception" as a variable name, as VC 7.1 complains about it
*
@@ -142,7 +145,7 @@ void DOMErrorImpl::setLocation(DOMLocator* const location)
fLocation = location;
}
-void DOMErrorImpl::setRelatedException(void* exc) const
+void DOMErrorImpl::setRelatedException(void*) const
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
}
diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.cpp b/src/xercesc/dom/impl/DOMImplementationImpl.cpp
index aa766ba444339e8520baf86f8cfc283bf1805e94..77731129a286f53617dabc81079464f8ee5f0521 100644
--- a/src/xercesc/dom/impl/DOMImplementationImpl.cpp
+++ b/src/xercesc/dom/impl/DOMImplementationImpl.cpp
@@ -155,7 +155,7 @@ XMLMsgLoader* DOMImplementationImpl::getMsgLoader4DOM()
}
return sMsgLoader4DOM;
-};
+}
// -----------------------------------------------------------------------
// Singleton DOMImplementationImpl
@@ -193,7 +193,7 @@ DOMImplementationImpl *DOMImplementationImpl::getDOMImplementationImpl()
}
return gDomimp;
-};
+}
// ------------------------------------------------------------
// DOMImplementation Virtual interface
@@ -253,7 +253,7 @@ DOMDocument *DOMImplementationImpl::createDocument(const XMLCh *namespaceURI,
//Introduced in DOM Level 3
-DOMImplementation* DOMImplementationImpl::getInterface(const XMLCh* feature){
+DOMImplementation* DOMImplementationImpl::getInterface(const XMLCh*){
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
@@ -300,7 +300,7 @@ bool DOMImplementation::loadDOMExceptionMsg
// ------------------------------------------------------------
//Introduced in DOM Level 3
DOMBuilder* DOMImplementationImpl::createDOMBuilder(const short mode,
- const XMLCh* const schemaType,
+ const XMLCh* const,
MemoryManager* const manager,
XMLGrammarPool* const gramPool)
{
diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.hpp b/src/xercesc/dom/impl/DOMImplementationImpl.hpp
index 61b07aed14a95ff2bd8b80d3929c60a5aaf55a58..974cd2d557b891b1a3bc2bb7732797e9df648cd7 100644
--- a/src/xercesc/dom/impl/DOMImplementationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMImplementationImpl.hpp
@@ -82,8 +82,8 @@ class DOMImplementationImpl: public XMemory,
public DOMImplementationSource
{
private:
- DOMImplementationImpl(const DOMImplementationImpl & other) {};
- DOMImplementationImpl & operator = (const DOMImplementationImpl & other) {return *this;};
+ DOMImplementationImpl(const DOMImplementationImpl &);
+ DOMImplementationImpl & operator = (const DOMImplementationImpl &);
protected:
DOMImplementationImpl() {};
public:
diff --git a/src/xercesc/dom/impl/DOMImplementationRegistry.cpp b/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
index 0a2e3a04ca835443a36cfe86bdc7695b8639bf58..d713209818efc71233bee34422c9279f850dcbff 100644
--- a/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
+++ b/src/xercesc/dom/impl/DOMImplementationRegistry.cpp
@@ -101,7 +101,7 @@ static void reinitDOMImplSrcVectorMutex()
{
delete gDOMImplSrcVectorMutex;
gDOMImplSrcVectorMutex = 0;
-};
+}
// -----------------------------------------------------------------------
// Get the static data
diff --git a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
index 6ee59e03c4aaf566056273edac7e4f5404b17a65..11eaa4f28a62ff740fcfde44c3c528241f187a23 100644
--- a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
@@ -77,13 +77,13 @@ DOMNamedNodeMapImpl::DOMNamedNodeMapImpl(DOMNode *ownerNod)
{
this->fOwnerNode=ownerNod;
this->fNodes = 0;
-};
+}
DOMNamedNodeMapImpl::~DOMNamedNodeMapImpl()
{
-};
+}
bool DOMNamedNodeMapImpl::readOnly() {
return castToNodeImpl(fOwnerNode)->isReadOnly();
@@ -108,7 +108,7 @@ DOMNamedNodeMapImpl *DOMNamedNodeMapImpl::cloneMap(DOMNode *ownerNod)
}
return newmap;
-};
+}
//
@@ -181,7 +181,7 @@ int DOMNamedNodeMapImpl::findNamePoint(const XMLCh *name) const
*******************/
return -1 - i; // not-found has to be encoded.
-};
+}
@@ -190,7 +190,7 @@ int DOMNamedNodeMapImpl::findNamePoint(const XMLCh *name) const
XMLSize_t DOMNamedNodeMapImpl::getLength() const
{
return (fNodes != 0) ? fNodes->size() : 0;
-};
+}
@@ -198,7 +198,7 @@ DOMNode * DOMNamedNodeMapImpl::getNamedItem(const XMLCh *name) const
{
int i=findNamePoint(name);
return (i<0) ? 0 : fNodes->elementAt(i);
-};
+}
@@ -206,7 +206,7 @@ DOMNode * DOMNamedNodeMapImpl::item(XMLSize_t index) const
{
return (fNodes != 0 && index < fNodes->size()) ?
fNodes->elementAt(index) : 0;
-};
+}
//
@@ -232,7 +232,7 @@ DOMNode * DOMNamedNodeMapImpl::removeNamedItem(const XMLCh *name)
castToNodeImpl(n)->fOwnerNode = fOwnerNode->getOwnerDocument();
castToNodeImpl(n)->isOwned(false);
return n;
-};
+}
@@ -280,7 +280,7 @@ DOMNode * DOMNamedNodeMapImpl::setNamedItem(DOMNode * arg)
}
return previous;
-};
+}
void DOMNamedNodeMapImpl::setReadOnly(bool readOnl, bool deep)
@@ -293,7 +293,7 @@ void DOMNamedNodeMapImpl::setReadOnly(bool readOnl, bool deep)
castToNodeImpl(fNodes->elementAt(i))->setReadOnly(readOnl, deep);
}
}
-};
+}
//Introduced in DOM Level 2
@@ -377,7 +377,7 @@ DOMNode * DOMNamedNodeMapImpl::setNamedItemNS(DOMNode *arg)
}
return previous;
-};
+}
// removeNamedItemNS() - Remove the named item, and return it.
@@ -448,7 +448,7 @@ DOMNode * DOMNamedNodeMapImpl::removeNamedItemAt(XMLSize_t index)
castToNodeImpl(n)->fOwnerNode = fOwnerNode->getOwnerDocument();
castToNodeImpl(n)->isOwned(false);
return n;
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
index da3ca78207c77a90bc0f2efef825192c68fd06dd..ded78e67be02917d1e51e26e43597857c56dae15 100644
--- a/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
@@ -117,7 +117,10 @@ public:
virtual DOMNode* setNamedItemNS(DOMNode *arg);
virtual DOMNode* removeNamedItemNS(const XMLCh *namespaceURI,
const XMLCh *localName);
-
+private:
+ // unimplemented
+ DOMNamedNodeMapImpl(const DOMNamedNodeMapImpl &);
+ DOMNamedNodeMapImpl & operator = (const DOMNamedNodeMapImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMNodeIDMap.cpp b/src/xercesc/dom/impl/DOMNodeIDMap.cpp
index 3c0ae5d1cf3f0496ab6e63774346036ae52f41d6..c75fd2c1d387bbd514b5b015457e40a466caaa76 100644
--- a/src/xercesc/dom/impl/DOMNodeIDMap.cpp
+++ b/src/xercesc/dom/impl/DOMNodeIDMap.cpp
@@ -75,9 +75,9 @@ static const float gMaxFill = 0.8f; // The maximum fraction of the total
// table entries to consume before exanding.
DOMNodeIDMap::DOMNodeIDMap(int initialSize, DOMDocument *doc)
+: fNumEntries(0)
+, fDoc(doc)
{
- fDoc = doc;
-
for (fSizeIndex = 0; gPrimes[fSizeIndex] < initialSize; fSizeIndex++)
{
if (gPrimes[fSizeIndex] == 0)
@@ -89,8 +89,7 @@ DOMNodeIDMap::DOMNodeIDMap(int initialSize, DOMDocument *doc)
}
}
- fSize = gPrimes[fSizeIndex];
- fNumEntries = 0;
+ fSize = gPrimes[fSizeIndex];
fMaxEntries = (XMLSize_t)(float(fSize) * gMaxFill);
//fTable = new (fDoc) DOMAttr*[fSize];
@@ -98,14 +97,14 @@ DOMNodeIDMap::DOMNodeIDMap(int initialSize, DOMDocument *doc)
XMLSize_t i;
for (i=0; i<fSize; i++)
fTable[i] = 0;
-};
+}
DOMNodeIDMap::~DOMNodeIDMap()
{
// don't delete - the document owns the storage.
fTable = 0;
-};
+}
@@ -152,7 +151,7 @@ void DOMNodeIDMap::add(DOMAttr *attr)
//
fTable[currentHash] = attr;
-};
+}
void DOMNodeIDMap::remove(DOMAttr *attr)
@@ -194,7 +193,7 @@ void DOMNodeIDMap::remove(DOMAttr *attr)
currentHash = currentHash % fSize;
}
-};
+}
DOMAttr *DOMNodeIDMap::find(const XMLCh *id)
@@ -227,7 +226,7 @@ DOMAttr *DOMNodeIDMap::find(const XMLCh *id)
currentHash = currentHash % fSize;
}
return 0; // Never gets here, but keeps some compilers happy.
-};
+}
//
@@ -279,7 +278,7 @@ void DOMNodeIDMap::growTable()
// delete [] oldTable; (The document owns the storage. The old table will just
// need to leak until until the document is discarded.)
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMNodeImpl.cpp b/src/xercesc/dom/impl/DOMNodeImpl.cpp
index 67cf07fae00f913d72398037f92bf168ff0baabe..76a0f97576be6b373229bb91262da925b54c0cfa 100644
--- a/src/xercesc/dom/impl/DOMNodeImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNodeImpl.cpp
@@ -114,11 +114,11 @@ static void reinitEmptyNodeList()
// DOMNodeImpl Functions
// -----------------------------------------------------------------------
DOMNodeImpl::DOMNodeImpl(DOMNode *ownerNode)
+: fOwnerNode(ownerNode)
{
this->flags = 0;
- // as long as we do not have any owner, fOwnerNode is our ownerDocument
- fOwnerNode = ownerNode;
-};
+ // as long as we do not have any owner, fOwnerNode is our ownerDocument
+}
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -130,27 +130,27 @@ DOMNodeImpl::DOMNodeImpl(const DOMNodeImpl &other)
// Need to break the association w/ original parent
this->fOwnerNode = other.getOwnerDocument();
this->isOwned(false);
-};
+}
DOMNodeImpl::~DOMNodeImpl() {
-};
+}
-DOMNode * DOMNodeImpl::appendChild(DOMNode *newChild)
+DOMNode * DOMNodeImpl::appendChild(DOMNode *)
{
// Only node types that don't allow children will use this default function.
// Others will go to DOMParentNode::appendChild.
throw DOMException(DOMException::HIERARCHY_REQUEST_ERR,0);
return 0;
// return insertBefore(newChild, 0);
-};
+}
DOMNamedNodeMap * DOMNodeImpl::getAttributes() const {
return 0; // overridden in ElementImpl
-};
+}
DOMNodeList *DOMNodeImpl::getChildNodes() const {
@@ -180,24 +180,24 @@ DOMNodeList *DOMNodeImpl::getChildNodes() const {
}
return (DOMNodeList *)gEmptyNodeList;
-};
+}
DOMNode * DOMNodeImpl::getFirstChild() const {
return 0; // overridden in ParentNode
-};
+}
DOMNode * DOMNodeImpl::getLastChild() const
{
return 0; // overridden in ParentNode
-};
+}
DOMNode * DOMNodeImpl::getNextSibling() const {
return 0; // overridden in ChildNode
-};
+}
const XMLCh * DOMNodeImpl::getNodeValue() const {
@@ -234,7 +234,7 @@ DOMDocument *DOMNodeImpl::getOwnerDocument() const
assert (fOwnerNode->getNodeType() == DOMNode::DOCUMENT_NODE);
return (DOMDocument *)fOwnerNode;
}
-};
+}
void DOMNodeImpl::setOwnerDocument(DOMDocument *doc) {
@@ -250,46 +250,46 @@ void DOMNodeImpl::setOwnerDocument(DOMDocument *doc) {
DOMNode * DOMNodeImpl::getParentNode() const
{
return 0; // overridden in ChildNode
-};
+}
DOMNode* DOMNodeImpl::getPreviousSibling() const
{
return 0; // overridden in ChildNode
-};
+}
bool DOMNodeImpl::hasChildNodes() const
{
return false;
-};
+}
-DOMNode *DOMNodeImpl::insertBefore(DOMNode *newChild, DOMNode *refChild) {
+DOMNode *DOMNodeImpl::insertBefore(DOMNode *, DOMNode *) {
throw DOMException(DOMException::HIERARCHY_REQUEST_ERR, 0);
return 0;
-};
+}
-DOMNode *DOMNodeImpl::removeChild(DOMNode *oldChild)
+DOMNode *DOMNodeImpl::removeChild(DOMNode *)
{
throw DOMException(DOMException::NOT_FOUND_ERR, 0);
return 0;
-};
+}
-DOMNode *DOMNodeImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
+DOMNode *DOMNodeImpl::replaceChild(DOMNode *, DOMNode *)
{
throw DOMException(DOMException::HIERARCHY_REQUEST_ERR,0);
return 0;
-};
+}
-void DOMNodeImpl::setNodeValue(const XMLCh *val)
+void DOMNodeImpl::setNodeValue(const XMLCh *)
{
// Default behavior is to do nothing, overridden in some subclasses
-};
+}
@@ -327,7 +327,7 @@ void DOMNodeImpl::setReadOnly(bool readOnl, bool deep)
void DOMNodeImpl::normalize()
{
// does nothing by default, overridden by subclasses
-};
+}
bool DOMNodeImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
@@ -351,7 +351,7 @@ const XMLCh *DOMNodeImpl::getLocalName() const
}
-void DOMNodeImpl::setPrefix(const XMLCh *fPrefix)
+void DOMNodeImpl::setPrefix(const XMLCh *)
{
throw DOMException(DOMException::NAMESPACE_ERR, 0);
}
@@ -359,16 +359,16 @@ void DOMNodeImpl::setPrefix(const XMLCh *fPrefix)
bool DOMNodeImpl::hasAttributes() const {
return 0; // overridden in ElementImpl
-};
+}
-const XMLCh *DOMNodeImpl::getXmlString() {return XMLUni::fgXMLString;};
-const XMLCh *DOMNodeImpl::getXmlURIString() {return XMLUni::fgXMLURIName;};
-const XMLCh *DOMNodeImpl::getXmlnsString() {return XMLUni::fgXMLNSString;};
-const XMLCh *DOMNodeImpl::getXmlnsURIString() {return XMLUni::fgXMLNSURIName;};
+const XMLCh *DOMNodeImpl::getXmlString() {return XMLUni::fgXMLString;}
+const XMLCh *DOMNodeImpl::getXmlURIString() {return XMLUni::fgXMLURIName;}
+const XMLCh *DOMNodeImpl::getXmlnsString() {return XMLUni::fgXMLNSString;}
+const XMLCh *DOMNodeImpl::getXmlnsURIString() {return XMLUni::fgXMLNSURIName;}
//Return a URI mapped from the given prefix and namespaceURI as below
// prefix namespaceURI output
@@ -1029,7 +1029,7 @@ const XMLCh* DOMNodeImpl::getTextContent(XMLCh* pzBuffer, unsigned int& rnBuf
}
-void DOMNodeImpl::setTextContent(const XMLCh* textContent){
+void DOMNodeImpl::setTextContent(const XMLCh*){
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
}
@@ -1089,7 +1089,7 @@ bool DOMNodeImpl::isDefaultNamespace(const XMLCh* namespaceURI) const{
}
}
-DOMNode* DOMNodeImpl::getInterface(const XMLCh* feature) {
+DOMNode* DOMNodeImpl::getInterface(const XMLCh*) {
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
diff --git a/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp b/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
index bcd8fb411ed63f7074f64d71340ffa6da931c6b7..f5295bf56362004ca851c58c62a22392d2ae0c91 100644
--- a/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
@@ -80,28 +80,28 @@ DOMNodeIteratorImpl::DOMNodeIteratorImpl (DOMDocument* doc,
unsigned long whatToShow,
DOMNodeFilter* nodeFilter,
bool expandEntityRef)
-: fDetached(false),
- fRoot(root),
- fCurrentNode(0),
+: fRoot(root),
+ fDocument(doc),
fWhatToShow(whatToShow),
fNodeFilter(nodeFilter),
- fForward(true),
fExpandEntityReferences(expandEntityRef),
- fDocument(doc)
+ fDetached(false),
+ fCurrentNode(0),
+ fForward(true)
{
}
DOMNodeIteratorImpl::DOMNodeIteratorImpl ( const DOMNodeIteratorImpl& toCopy)
- : fDetached(toCopy.fDetached),
- fRoot(toCopy.fRoot),
- fCurrentNode(toCopy.fCurrentNode),
+ : fRoot(toCopy.fRoot),
+ fDocument(toCopy.fDocument),
fWhatToShow(toCopy.fWhatToShow),
fNodeFilter(toCopy.fNodeFilter),
- fForward(toCopy.fForward),
fExpandEntityReferences(toCopy.fExpandEntityReferences),
- fDocument(toCopy.fDocument)
+ fDetached(toCopy.fDetached),
+ fCurrentNode(toCopy.fCurrentNode),
+ fForward(toCopy.fForward)
{
}
diff --git a/src/xercesc/dom/impl/DOMNodeListImpl.cpp b/src/xercesc/dom/impl/DOMNodeListImpl.cpp
index a6a4865608b2e4a8fb8584bfbe9560c0d2be190f..ab2c25c1c2c3a540bffde4c32b2972bd60f9eddb 100644
--- a/src/xercesc/dom/impl/DOMNodeListImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNodeListImpl.cpp
@@ -71,14 +71,14 @@ XERCES_CPP_NAMESPACE_BEGIN
//
DOMNodeListImpl::DOMNodeListImpl(DOMNode *node)
+: fNode(node)
{
- fNode = node;
}
DOMNodeListImpl:: ~DOMNodeListImpl()
{
-};
+}
@@ -93,7 +93,7 @@ XMLSize_t DOMNodeListImpl::getLength() const{
}
return count;
-};
+}
@@ -105,7 +105,7 @@ DOMNode *DOMNodeListImpl::item(XMLSize_t index) const{
return node;
}
return 0;
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMNodeVector.cpp b/src/xercesc/dom/impl/DOMNodeVector.cpp
index 50b5f4827f8986b439201f8565091f8db08fda54..5a0a6cb8425fd6f6aa9d6c2cf7210e7e8f27f6b2 100644
--- a/src/xercesc/dom/impl/DOMNodeVector.cpp
+++ b/src/xercesc/dom/impl/DOMNodeVector.cpp
@@ -77,11 +77,11 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMNodeVector::DOMNodeVector(DOMDocument *doc)
{
init(doc, 10);
-};
+}
DOMNodeVector::DOMNodeVector(DOMDocument *doc, XMLSize_t size) {
init(doc, size);
-};
+}
void DOMNodeVector::init(DOMDocument *doc, XMLSize_t size) {
@@ -94,18 +94,18 @@ void DOMNodeVector::init(DOMDocument *doc, XMLSize_t size) {
data[i] = 0;
allocatedSize = size;
nextFreeSlot = 0;
-};
+}
DOMNodeVector::~DOMNodeVector() {
-};
+}
void DOMNodeVector::addElement(DOMNode *elem) {
checkSpace();
data[nextFreeSlot] = elem;
++nextFreeSlot;
-};
+}
void DOMNodeVector::checkSpace() {
@@ -121,7 +121,7 @@ void DOMNodeVector::checkSpace() {
assert(newData != 0);
for (XMLSize_t i=0; i<allocatedSize; i++) {
newData[i] = data[i];
- };
+ }
// delete [] data; // revisit. Can't delete! Recycle?
allocatedSize = newAllocatedSize;
data = newData;
@@ -133,13 +133,13 @@ DOMNode *DOMNodeVector::elementAt(XMLSize_t index) {
if (index >= nextFreeSlot)
return 0;
return data[index];
-};
+}
DOMNode *DOMNodeVector::lastElement() {
if (nextFreeSlot == 0)
return 0;
return data[nextFreeSlot-1];
-};
+}
void DOMNodeVector::insertElementAt(DOMNode *elem, XMLSize_t index) {
@@ -154,7 +154,7 @@ void DOMNodeVector::insertElementAt(DOMNode *elem, XMLSize_t index) {
data[index] = elem;
++nextFreeSlot;
-};
+}
void DOMNodeVector::removeElementAt(XMLSize_t index) {
@@ -163,21 +163,21 @@ void DOMNodeVector::removeElementAt(XMLSize_t index) {
data[i] = data[i+1];
}
--nextFreeSlot;
-};
+}
void DOMNodeVector::reset() {
nextFreeSlot = 0;
-};
+}
void DOMNodeVector::setElementAt(DOMNode *elem, XMLSize_t index) {
assert(index < nextFreeSlot);
data[index] = elem;
-};
+}
XMLSize_t DOMNodeVector::size() {
return nextFreeSlot;
-};
+}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMNodeVector.hpp b/src/xercesc/dom/impl/DOMNodeVector.hpp
index c47839d58e141767b5b1e1481aa64f47cf7d1d11..17f91fb00c6e3a1aa9934730fef33a657171ad0e 100644
--- a/src/xercesc/dom/impl/DOMNodeVector.hpp
+++ b/src/xercesc/dom/impl/DOMNodeVector.hpp
@@ -85,6 +85,10 @@ private:
XMLSize_t nextFreeSlot;
void init(DOMDocument *doc, XMLSize_t size);
void checkSpace();
+
+ // unimplemented
+ DOMNodeVector ( const DOMNodeVector& toCopy);
+ DOMNodeVector& operator= (const DOMNodeVector& other);
public:
DOMNodeVector(DOMDocument *doc);
diff --git a/src/xercesc/dom/impl/DOMNormalizer.cpp b/src/xercesc/dom/impl/DOMNormalizer.cpp
index b29ac98d6f349788c4e09e3f26937df197ce701b..0dbbbe2c6ab31056ab4d740e04403715d6df7ce4 100644
--- a/src/xercesc/dom/impl/DOMNormalizer.cpp
+++ b/src/xercesc/dom/impl/DOMNormalizer.cpp
@@ -164,7 +164,7 @@ DOMNormalizer::DOMNormalizer(MemoryManager* const manager)
, fMemoryManager(manager)
{
fNSScope = new (fMemoryManager) InScopeNamespaces(fMemoryManager);
-};
+}
DOMNormalizer::~DOMNormalizer() {
delete fNSScope;
@@ -331,8 +331,7 @@ void DOMNormalizer::namespaceFixUp(DOMElementImpl *ele) const {
// hp aCC complains this i is a redefinition of the i on line 283
for(int j = 0; j < len; j++) {
DOMAttr *at = (DOMAttr*)attrMap->item(j);
- const XMLCh *uri = at->getNamespaceURI();
- const XMLCh *value = at->getNodeValue();
+ const XMLCh *uri = at->getNamespaceURI();
const XMLCh* prefix = at->getPrefix();
if(!XMLString::equals(XMLUni::fgXMLNSURIName, uri)) {
diff --git a/src/xercesc/dom/impl/DOMNormalizer.hpp b/src/xercesc/dom/impl/DOMNormalizer.hpp
index 8ccebbbb8fe79002136d9cde833c0014ee7d179b..854394458d5aaa4674fc815e5ae201e7e26219b7 100644
--- a/src/xercesc/dom/impl/DOMNormalizer.hpp
+++ b/src/xercesc/dom/impl/DOMNormalizer.hpp
@@ -99,6 +99,9 @@ class DOMNormalizer : public XMemory {
private:
RefHashTableOf<XMLCh> *fPrefixHash;
RefHashTableOf<XMLCh> *fUriHash;
+ // unimplemented
+ Scope ( const Scope& toCopy);
+ Scope& operator= (const Scope& other);
};
public:
@@ -117,6 +120,9 @@ class DOMNormalizer : public XMemory {
private:
RefVectorOf<Scope> *fScopes;
Scope *lastScopeWithBindings;
+ // unimplemented
+ InScopeNamespaces ( const InScopeNamespaces& toCopy);
+ InScopeNamespaces& operator= (const InScopeNamespaces& other);
};
public:
@@ -135,6 +141,9 @@ public:
static void reinitMsgLoader();
private:
+ // unimplemented
+ DOMNormalizer ( const DOMNormalizer& toCopy);
+ DOMNormalizer& operator= (const DOMNormalizer& other);
/**
* Recursively normalizes a node
diff --git a/src/xercesc/dom/impl/DOMNotationImpl.cpp b/src/xercesc/dom/impl/DOMNotationImpl.cpp
index 51138f333db628567d429f91c5e38c0c9fc286b2..69478dfa08cc0db1a6996115347494f39055f10d 100644
--- a/src/xercesc/dom/impl/DOMNotationImpl.cpp
+++ b/src/xercesc/dom/impl/DOMNotationImpl.cpp
@@ -71,22 +71,19 @@ DOMNotationImpl::DOMNotationImpl(DOMDocument *ownerDoc, const XMLCh *nName)
{
fNode.setIsLeafNode(true);
fName = ((DOMDocumentImpl *)ownerDoc)->getPooledString(nName);
-};
+}
-DOMNotationImpl::DOMNotationImpl(const DOMNotationImpl &other, bool deep)
- : fNode(other.fNode)
+DOMNotationImpl::DOMNotationImpl(const DOMNotationImpl &other, bool)
+ : fNode(other.fNode), fName(other.fName), fPublicId(other.fPublicId),
+ fSystemId(other.fSystemId), fBaseURI(other.fBaseURI)
{
fNode.setIsLeafNode(true);
- fName = other.fName;
- fPublicId = other.fPublicId;
- fSystemId = other.fSystemId;
- fBaseURI = other.fBaseURI;
-};
+}
DOMNotationImpl::~DOMNotationImpl()
{
-};
+}
DOMNode *DOMNotationImpl::cloneNode(bool deep) const
@@ -94,36 +91,36 @@ DOMNode *DOMNotationImpl::cloneNode(bool deep) const
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::NOTATION_OBJECT) DOMNotationImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMNotationImpl::getNodeName() const {
return fName;
-};
+}
short DOMNotationImpl::getNodeType() const {
return DOMNode::NOTATION_NODE;
-};
+}
const XMLCh * DOMNotationImpl::getPublicId() const
{
return fPublicId;
-};
+}
const XMLCh * DOMNotationImpl::getSystemId() const
{
return fSystemId;
-};
+}
void DOMNotationImpl::setNodeValue(const XMLCh *arg)
{
fNode.setNodeValue(arg);
-};
+}
void DOMNotationImpl::setPublicId(const XMLCh *arg)
@@ -133,7 +130,7 @@ void DOMNotationImpl::setPublicId(const XMLCh *arg)
DOMException::NO_MODIFICATION_ALLOWED_ERR,0);
fPublicId = ((DOMDocumentImpl *)getOwnerDocument())->cloneString(arg);
-};
+}
void DOMNotationImpl::setSystemId(const XMLCh *arg)
@@ -143,7 +140,7 @@ void DOMNotationImpl::setSystemId(const XMLCh *arg)
DOMException::NO_MODIFICATION_ALLOWED_ERR,0);
fSystemId = ((DOMDocumentImpl *)getOwnerDocument())->cloneString(arg);
-};
+}
void DOMNotationImpl::release()
{
@@ -177,42 +174,42 @@ const XMLCh* DOMNotationImpl::getBaseURI() const
}
- DOMNode* DOMNotationImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); };
- DOMNamedNodeMap* DOMNotationImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMNotationImpl::getChildNodes() const {return fNode.getChildNodes (); };
- DOMNode* DOMNotationImpl::getFirstChild() const {return fNode.getFirstChild (); };
- DOMNode* DOMNotationImpl::getLastChild() const {return fNode.getLastChild (); };
- const XMLCh* DOMNotationImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMNotationImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMNotationImpl::getNextSibling() const {return fNode.getNextSibling (); };
- const XMLCh* DOMNotationImpl::getNodeValue() const {return fNode.getNodeValue (); };
- DOMDocument* DOMNotationImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); };
- const XMLCh* DOMNotationImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMNotationImpl::getParentNode() const {return fNode.getParentNode (); };
- DOMNode* DOMNotationImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); };
- bool DOMNotationImpl::hasChildNodes() const {return fNode.hasChildNodes (); };
+ DOMNode* DOMNotationImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); }
+ DOMNamedNodeMap* DOMNotationImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMNotationImpl::getChildNodes() const {return fNode.getChildNodes (); }
+ DOMNode* DOMNotationImpl::getFirstChild() const {return fNode.getFirstChild (); }
+ DOMNode* DOMNotationImpl::getLastChild() const {return fNode.getLastChild (); }
+ const XMLCh* DOMNotationImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMNotationImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMNotationImpl::getNextSibling() const {return fNode.getNextSibling (); }
+ const XMLCh* DOMNotationImpl::getNodeValue() const {return fNode.getNodeValue (); }
+ DOMDocument* DOMNotationImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); }
+ const XMLCh* DOMNotationImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMNotationImpl::getParentNode() const {return fNode.getParentNode (); }
+ DOMNode* DOMNotationImpl::getPreviousSibling() const {return fNode.getPreviousSibling (); }
+ bool DOMNotationImpl::hasChildNodes() const {return fNode.hasChildNodes (); }
DOMNode* DOMNotationImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fNode.insertBefore (newChild, refChild); };
- void DOMNotationImpl::normalize() {fNode.normalize (); };
- DOMNode* DOMNotationImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); };
+ {return fNode.insertBefore (newChild, refChild); }
+ void DOMNotationImpl::normalize() {fNode.normalize (); }
+ DOMNode* DOMNotationImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); }
DOMNode* DOMNotationImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fNode.replaceChild (newChild, oldChild); };
+ {return fNode.replaceChild (newChild, oldChild); }
bool DOMNotationImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMNotationImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMNotationImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMNotationImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMNotationImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMNotationImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMNotationImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMNotationImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMNotationImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }
void* DOMNotationImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMNotationImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- short DOMNotationImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMNotationImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMNotationImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMNotationImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMNotationImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMNotationImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMNotationImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMNotationImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ short DOMNotationImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMNotationImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMNotationImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMNotationImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMNotationImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMNotationImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMNotationImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMNotationImpl.hpp b/src/xercesc/dom/impl/DOMNotationImpl.hpp
index 2840dfbf0c2b59f69ecb73f94c6201859077c07b..091b9e77f456837b8421913fdee85a8d6fe65bb9 100644
--- a/src/xercesc/dom/impl/DOMNotationImpl.hpp
+++ b/src/xercesc/dom/impl/DOMNotationImpl.hpp
@@ -119,6 +119,9 @@ public:
// NON-DOM: set base uri
virtual void setBaseURI(const XMLCh *arg);
+private:
+ // unimplemented
+ DOMNotationImpl& operator= (const DOMNotationImpl& other);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMParentNode.cpp b/src/xercesc/dom/impl/DOMParentNode.cpp
index efbc334c26b5c54efceea1dd2656fe4a15688e47..0ae8b0c2d9504dde7858ca6c168a56eca027c31b 100644
--- a/src/xercesc/dom/impl/DOMParentNode.cpp
+++ b/src/xercesc/dom/impl/DOMParentNode.cpp
@@ -73,10 +73,9 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMParentNode::DOMParentNode(DOMDocument *ownerDoc)
- : fOwnerDocument(ownerDoc), fChildNodeList(castToNode(this))
-{
- fFirstChild = 0;
-};
+ : fOwnerDocument(ownerDoc), fFirstChild(0), fChildNodeList(castToNode(this))
+{
+}
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -87,7 +86,7 @@ DOMParentNode::DOMParentNode(const DOMParentNode &other) :
// Need to break the association w/ original kids
this->fFirstChild = 0;
-};
+}
void DOMParentNode::changed()
{
@@ -100,13 +99,13 @@ int DOMParentNode::changes() const
{
DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
return doc->changes();
-};
+}
DOMNode * DOMParentNode::appendChild(DOMNode *newChild)
{
return insertBefore(newChild, 0);
-};
+}
void DOMParentNode::cloneChildren(const DOMNode *other) {
@@ -135,18 +134,18 @@ void DOMParentNode::setOwnerDocument(DOMDocument* doc) {
DOMNodeList *DOMParentNode::getChildNodes() const {
const DOMNodeList *ret = &fChildNodeList;
return (DOMNodeList *)ret; // cast off const.
-};
+}
DOMNode * DOMParentNode::getFirstChild() const {
return fFirstChild;
-};
+}
DOMNode * DOMParentNode::getLastChild() const
{
return lastChild();
-};
+}
DOMNode * DOMParentNode::lastChild() const
{
@@ -158,7 +157,7 @@ DOMNode * DOMParentNode::lastChild() const
DOMChildNode *firstChild = castToChildImpl(fFirstChild);
DOMNode *ret = firstChild->previousSibling;
return ret;
-};
+}
//
@@ -176,7 +175,7 @@ void DOMParentNode::lastChild(DOMNode *node) {
bool DOMParentNode::hasChildNodes() const
{
return fFirstChild!=0;
-};
+}
@@ -301,7 +300,7 @@ DOMNode *DOMParentNode::insertBefore(DOMNode *newChild, DOMNode *refChild) {
}
return newChild;
-};
+}
@@ -373,7 +372,7 @@ DOMNode *DOMParentNode::removeChild(DOMNode *oldChild)
changed();
return oldChild;
-};
+}
DOMNode *DOMParentNode::replaceChild(DOMNode *newChild, DOMNode *oldChild)
@@ -381,7 +380,7 @@ DOMNode *DOMParentNode::replaceChild(DOMNode *newChild, DOMNode *oldChild)
insertBefore(newChild, oldChild);
// changed() already done.
return removeChild(oldChild);
-};
+}
@@ -412,11 +411,11 @@ void DOMParentNode::normalize()
else
if (kid->getNodeType() == DOMNode::ELEMENT_NODE)
kid->normalize();
- };
+ }
// changed() will have occurred when the removeChild() was done,
// so does not have to be reissued.
-};
+}
//Introduced in DOM Level 3
diff --git a/src/xercesc/dom/impl/DOMParentNode.hpp b/src/xercesc/dom/impl/DOMParentNode.hpp
index d0320db2bee579f8c9a083a6859929df5d9eb479..cc9dcb0bffb38785e2b92ecb1bdc059aa082f40a 100644
--- a/src/xercesc/dom/impl/DOMParentNode.hpp
+++ b/src/xercesc/dom/impl/DOMParentNode.hpp
@@ -138,6 +138,10 @@ public:
void cloneChildren(const DOMNode *other);
DOMNode * lastChild() const;
void lastChild(DOMNode *);
+
+private:
+ // unimplemented
+ DOMParentNode& operator= (const DOMParentNode& other);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
index 5eb371c5f9cc9e3e8df0b005dc058e736856e13a..c5778780c443264111b3d1422583e1e22b80b49b 100644
--- a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
+++ b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
@@ -73,27 +73,26 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMProcessingInstructionImpl::DOMProcessingInstructionImpl(DOMDocument *ownerDoc,
const XMLCh *targt,
const XMLCh *dat)
- : fNode(ownerDoc), fBaseURI(0), fCharacterData(ownerDoc, dat)
+ : fNode(ownerDoc), fCharacterData(ownerDoc, dat), fBaseURI(0)
{
fNode.setIsLeafNode(true);
this->fTarget = ((DOMDocumentImpl *)ownerDoc)->cloneString(targt);
-};
+}
DOMProcessingInstructionImpl::DOMProcessingInstructionImpl(
const DOMProcessingInstructionImpl &other,
- bool deep)
- : fNode(other.fNode), fChild(other.fChild), fCharacterData(other.fCharacterData)
+ bool)
+ : fNode(other.fNode), fChild(other.fChild), fCharacterData(other.fCharacterData),
+ fTarget(other.fTarget), fBaseURI(other.fBaseURI)
{
fNode.setIsLeafNode(true);
- fTarget = other.fTarget;
- fBaseURI = other.fBaseURI;
-};
+}
DOMProcessingInstructionImpl::~DOMProcessingInstructionImpl()
{
-};
+}
DOMNode *DOMProcessingInstructionImpl::cloneNode(bool deep) const
@@ -101,18 +100,18 @@ DOMNode *DOMProcessingInstructionImpl::cloneNode(bool deep) const
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::PROCESSING_INSTRUCTION_OBJECT) DOMProcessingInstructionImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMProcessingInstructionImpl::getNodeName() const
{
return fTarget;
-};
+}
short DOMProcessingInstructionImpl::getNodeType() const {
return DOMNode::PROCESSING_INSTRUCTION_NODE;
-};
+}
/** A PI's "target" states what processor channel the PI's data
@@ -128,7 +127,7 @@ should be directed to. It is defined differently in HTML and XML.
const XMLCh * DOMProcessingInstructionImpl::getTarget() const
{
return fTarget;
-};
+}
void DOMProcessingInstructionImpl::release()
@@ -192,60 +191,60 @@ DOMProcessingInstruction *DOMProcessingInstructionImpl::splitText(XMLSize_t offs
}
return newText;
-};
+}
//
// Delegation stubs for inherited functions
//
- DOMNode* DOMProcessingInstructionImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); };
- DOMNamedNodeMap* DOMProcessingInstructionImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMProcessingInstructionImpl::getChildNodes() const {return fNode.getChildNodes (); };
- DOMNode* DOMProcessingInstructionImpl::getFirstChild() const {return fNode.getFirstChild (); };
- DOMNode* DOMProcessingInstructionImpl::getLastChild() const {return fNode.getLastChild (); };
- const XMLCh* DOMProcessingInstructionImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMProcessingInstructionImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMProcessingInstructionImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMProcessingInstructionImpl::getNodeValue() const {return fCharacterData.getNodeValue (); };
- DOMDocument* DOMProcessingInstructionImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); };
- const XMLCh* DOMProcessingInstructionImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMProcessingInstructionImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMProcessingInstructionImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMProcessingInstructionImpl::hasChildNodes() const {return fNode.hasChildNodes (); };
+ DOMNode* DOMProcessingInstructionImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); }
+ DOMNamedNodeMap* DOMProcessingInstructionImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMProcessingInstructionImpl::getChildNodes() const {return fNode.getChildNodes (); }
+ DOMNode* DOMProcessingInstructionImpl::getFirstChild() const {return fNode.getFirstChild (); }
+ DOMNode* DOMProcessingInstructionImpl::getLastChild() const {return fNode.getLastChild (); }
+ const XMLCh* DOMProcessingInstructionImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMProcessingInstructionImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMProcessingInstructionImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMProcessingInstructionImpl::getNodeValue() const {return fCharacterData.getNodeValue (); }
+ DOMDocument* DOMProcessingInstructionImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); }
+ const XMLCh* DOMProcessingInstructionImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMProcessingInstructionImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMProcessingInstructionImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMProcessingInstructionImpl::hasChildNodes() const {return fNode.hasChildNodes (); }
DOMNode* DOMProcessingInstructionImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fNode.insertBefore (newChild, refChild); };
- void DOMProcessingInstructionImpl::normalize() {fNode.normalize (); };
- DOMNode* DOMProcessingInstructionImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); };
+ {return fNode.insertBefore (newChild, refChild); }
+ void DOMProcessingInstructionImpl::normalize() {fNode.normalize (); }
+ DOMNode* DOMProcessingInstructionImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); }
DOMNode* DOMProcessingInstructionImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fNode.replaceChild (newChild, oldChild); };
+ {return fNode.replaceChild (newChild, oldChild); }
bool DOMProcessingInstructionImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMProcessingInstructionImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMProcessingInstructionImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMProcessingInstructionImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMProcessingInstructionImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMProcessingInstructionImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMProcessingInstructionImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMProcessingInstructionImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMProcessingInstructionImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }
void* DOMProcessingInstructionImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMProcessingInstructionImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- short DOMProcessingInstructionImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMProcessingInstructionImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMProcessingInstructionImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMProcessingInstructionImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMProcessingInstructionImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMProcessingInstructionImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMProcessingInstructionImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMProcessingInstructionImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ short DOMProcessingInstructionImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMProcessingInstructionImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMProcessingInstructionImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMProcessingInstructionImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMProcessingInstructionImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMProcessingInstructionImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMProcessingInstructionImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
//
// Delegation of CharacerData functions.
//
- const XMLCh* DOMProcessingInstructionImpl::getData() const {return fCharacterData.getData();};
+ const XMLCh* DOMProcessingInstructionImpl::getData() const {return fCharacterData.getData();}
void DOMProcessingInstructionImpl::deleteData(XMLSize_t offset, XMLSize_t count)
- {fCharacterData.deleteData(this, offset, count);};
+ {fCharacterData.deleteData(this, offset, count);}
const XMLCh* DOMProcessingInstructionImpl::substringData(XMLSize_t offset, XMLSize_t count) const
- {return fCharacterData.substringData(this, offset, count);};
- void DOMProcessingInstructionImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
- void DOMProcessingInstructionImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+ {return fCharacterData.substringData(this, offset, count);}
+ void DOMProcessingInstructionImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);}
+ void DOMProcessingInstructionImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
index 61809d9be3fd726a50cd03d695e67b8edfb30cfb..4e2284dd74dd8562fefea578aaafb6e269ffbc09 100644
--- a/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
+++ b/src/xercesc/dom/impl/DOMProcessingInstructionImpl.hpp
@@ -114,6 +114,12 @@ public:
void deleteData(XMLSize_t offset, XMLSize_t count);
const XMLCh* substringData(XMLSize_t offset, XMLSize_t count) const;
DOMProcessingInstruction* splitText(XMLSize_t offset);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMProcessingInstructionImpl & operator = (const DOMProcessingInstructionImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMRangeImpl.cpp b/src/xercesc/dom/impl/DOMRangeImpl.cpp
index 48d05ee5e5c45e9a5471528fba6285066d40b729..346658eb3f5500252934bf04d84dde302f9391f0 100644
--- a/src/xercesc/dom/impl/DOMRangeImpl.cpp
+++ b/src/xercesc/dom/impl/DOMRangeImpl.cpp
@@ -83,28 +83,29 @@ XERCES_CPP_NAMESPACE_BEGIN
DOMRangeImpl::DOMRangeImpl(DOMDocument* doc, MemoryManager* const manager)
- : fDocument(doc),
- fStartContainer(doc),
+ : fStartContainer(doc),
fStartOffset(0),
fEndContainer(doc),
- fEndOffset(0),
- fDetached(false),
+ fEndOffset(0),
fCollapsed(true),
+ fDocument(doc),
+ fDetached(false),
fRemoveChild(0),
fMemoryManager(manager)
{
}
DOMRangeImpl::DOMRangeImpl(const DOMRangeImpl& other)
+: fStartContainer(other.fStartContainer),
+ fStartOffset(other.fStartOffset),
+ fEndContainer(other.fEndContainer),
+ fEndOffset(other.fEndOffset),
+ fCollapsed(other.fCollapsed),
+ fDocument(other.fDocument),
+ fDetached(other.fDetached),
+ fRemoveChild(other.fRemoveChild),
+ fMemoryManager(other.fMemoryManager)
{
- fDocument = other.fDocument;
- fStartContainer = other.fStartContainer;
- fStartOffset = other.fStartOffset;
- fEndContainer = other.fEndContainer;
- fEndOffset = other.fEndOffset;
- fDetached = other.fDetached;
- fCollapsed = other.fCollapsed;
- fRemoveChild = other.fRemoveChild;
}
DOMRangeImpl::~DOMRangeImpl()
@@ -598,8 +599,6 @@ void DOMRangeImpl::surroundContents(DOMNode* newParent)
DOMRangeException::INVALID_NODE_TYPE_ERR, 0);
}
- DOMNode* root = (DOMNode*) getCommonAncestorContainer();
-
DOMNode* realStart = fStartContainer;
DOMNode* realEnd = fEndContainer;
@@ -1034,9 +1033,10 @@ bool DOMRangeImpl::hasLegalRootContainer(const DOMNode* node) const {
case DOMNode::ATTRIBUTE_NODE:
case DOMNode::DOCUMENT_NODE:
case DOMNode::DOCUMENT_FRAGMENT_NODE:
- return true;
+ return true;
+ default:
+ return false;
}
- return false;
}
bool DOMRangeImpl::isLegalContainedNode(const DOMNode* node ) const {
@@ -1049,9 +1049,10 @@ bool DOMRangeImpl::isLegalContainedNode(const DOMNode* node ) const {
case DOMNode::ATTRIBUTE_NODE:
case DOMNode::ENTITY_NODE:
case DOMNode::NOTATION_NODE:
- return false;
- }
- return true;
+ return false;
+ default:
+ return true;
+ }
}
XMLSize_t DOMRangeImpl::indexOf(const DOMNode* child, const DOMNode* parent) const
@@ -1276,7 +1277,6 @@ DOMDocumentFragment* DOMRangeImpl::traverseSameContainer( int how )
if ( fStartOffset==fEndOffset )
return frag;
- DOMNode* current = fStartContainer;
DOMNode* cloneCurrent = 0;
// Text node needs special case handling
diff --git a/src/xercesc/dom/impl/DOMRangeImpl.hpp b/src/xercesc/dom/impl/DOMRangeImpl.hpp
index e230a6d979bcfee36c889f595ca37f240ceec187..d44e63148a5e0f1b73aef4237c7b09b392b4202a 100644
--- a/src/xercesc/dom/impl/DOMRangeImpl.hpp
+++ b/src/xercesc/dom/impl/DOMRangeImpl.hpp
@@ -203,6 +203,10 @@ private:
DOMNode* traverseTextNode( DOMNode *n, bool isLeft, int how );
DOMNode* getSelectedNode( DOMNode *container, int offset );
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMRangeImpl & operator = (const DOMRangeImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMStringPool.cpp b/src/xercesc/dom/impl/DOMStringPool.cpp
index f722830fc8af87102cb2ddd8e24401b7747b55a5..7db164d1e51b616315a77cffa32ef8651cba4d13 100644
--- a/src/xercesc/dom/impl/DOMStringPool.cpp
+++ b/src/xercesc/dom/impl/DOMStringPool.cpp
@@ -104,23 +104,24 @@ static DOMStringPoolEntry *createSPE(const XMLCh *str, DOMDocumentImpl *doc)
DOMStringPool::DOMStringPool(int hashTableSize, DOMDocumentImpl *doc)
+: fDoc(doc)
+, fHashTableSize(hashTableSize)
{
- fDoc = doc; // needed to get access to the doc's storage allocator.
- fHashTableSize = hashTableSize;
+ // needed to get access to the doc's storage allocator.
//fHashTable = new (fDoc) DOMStringPoolEntry *[hashTableSize];
void* p = doc->allocate(sizeof(DOMStringPoolEntry*) * hashTableSize);
fHashTable = (DOMStringPoolEntry**) p;
for (int i=0; i<fHashTableSize; i++)
fHashTable[i] = 0;
-};
+}
// Destructor. Nothing to do, since storage all belongs to the document.
//
DOMStringPool::~DOMStringPool()
{
-};
+}
const XMLCh *DOMStringPool::getPooledString(const XMLCh *in)
@@ -140,7 +141,7 @@ const XMLCh *DOMStringPool::getPooledString(const XMLCh *in)
// This string hasn't been seen before. Add it to the pool.
*pspe = spe = createSPE(in, fDoc);
return spe->fString;
-};
+}
// -----------------------------------------------------------------------
diff --git a/src/xercesc/dom/impl/DOMStringPool.hpp b/src/xercesc/dom/impl/DOMStringPool.hpp
index 9ec1a458bab349f8a265f2fc0f6b41a7760f6573..27446cb576a1c2b998ad30a153656b6504842968 100644
--- a/src/xercesc/dom/impl/DOMStringPool.hpp
+++ b/src/xercesc/dom/impl/DOMStringPool.hpp
@@ -199,6 +199,12 @@ private :
unsigned int fIndex;
unsigned int fCapacity;
DOMDocumentImpl* fDoc;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMBuffer(const DOMBuffer &);
+ DOMBuffer & operator = (const DOMBuffer &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMTextImpl.cpp b/src/xercesc/dom/impl/DOMTextImpl.cpp
index c3fbc3f6691c44ffc230d3f43c1cb58104de5292..a3604e07e1945f2a2a48d83a403ff900b37f0004 100644
--- a/src/xercesc/dom/impl/DOMTextImpl.cpp
+++ b/src/xercesc/dom/impl/DOMTextImpl.cpp
@@ -83,17 +83,17 @@ DOMTextImpl::DOMTextImpl(DOMDocument *ownerDoc, const XMLCh *dat)
: fNode(ownerDoc), fCharacterData(ownerDoc, dat)
{
fNode.setIsLeafNode(true);
-};
+}
-DOMTextImpl::DOMTextImpl(const DOMTextImpl &other, bool deep)
+DOMTextImpl::DOMTextImpl(const DOMTextImpl &other, bool)
: fNode(other.fNode), fCharacterData(other.fCharacterData)
{
fNode.setIsLeafNode(true);
-};
+}
DOMTextImpl::~DOMTextImpl()
{
-};
+}
DOMNode *DOMTextImpl::cloneNode(bool deep) const
@@ -101,7 +101,7 @@ DOMNode *DOMTextImpl::cloneNode(bool deep) const
DOMNode* newNode = new (getOwnerDocument(), DOMDocumentImpl::TEXT_OBJECT) DOMTextImpl(*this, deep);
fNode.callUserDataHandlers(DOMUserDataHandler::NODE_CLONED, this, newNode);
return newNode;
-};
+}
const XMLCh * DOMTextImpl::getNodeName() const {
@@ -111,7 +111,7 @@ const XMLCh * DOMTextImpl::getNodeName() const {
short DOMTextImpl::getNodeType() const {
return DOMNode::TEXT_NODE;
-};
+}
DOMText *DOMTextImpl::splitText(XMLSize_t offset)
@@ -148,7 +148,7 @@ DOMText *DOMTextImpl::splitText(XMLSize_t offset)
}
return newText;
-};
+}
bool DOMTextImpl::isIgnorableWhitespace() const
@@ -174,7 +174,7 @@ const XMLCh* DOMTextImpl::getWholeText() {
return 0;
}
-DOMText* DOMTextImpl::replaceWholeText(const XMLCh* content){
+DOMText* DOMTextImpl::replaceWholeText(const XMLCh*){
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
return 0;
}
@@ -200,43 +200,43 @@ void DOMTextImpl::release()
//
// Delegation functions
//
- DOMNode* DOMTextImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); };
- DOMNamedNodeMap* DOMTextImpl::getAttributes() const {return fNode.getAttributes (); };
- DOMNodeList* DOMTextImpl::getChildNodes() const {return fNode.getChildNodes (); };
- DOMNode* DOMTextImpl::getFirstChild() const {return fNode.getFirstChild (); };
- DOMNode* DOMTextImpl::getLastChild() const {return fNode.getLastChild (); };
- const XMLCh* DOMTextImpl::getLocalName() const {return fNode.getLocalName (); };
- const XMLCh* DOMTextImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); };
- DOMNode* DOMTextImpl::getNextSibling() const {return fChild.getNextSibling (); };
- const XMLCh* DOMTextImpl::getNodeValue() const {return fCharacterData.getNodeValue (); };
- DOMDocument* DOMTextImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); };
- const XMLCh* DOMTextImpl::getPrefix() const {return fNode.getPrefix (); };
- DOMNode* DOMTextImpl::getParentNode() const {return fChild.getParentNode (this); };
- DOMNode* DOMTextImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); };
- bool DOMTextImpl::hasChildNodes() const {return fNode.hasChildNodes (); };
+ DOMNode* DOMTextImpl::appendChild(DOMNode *newChild) {return fNode.appendChild (newChild); }
+ DOMNamedNodeMap* DOMTextImpl::getAttributes() const {return fNode.getAttributes (); }
+ DOMNodeList* DOMTextImpl::getChildNodes() const {return fNode.getChildNodes (); }
+ DOMNode* DOMTextImpl::getFirstChild() const {return fNode.getFirstChild (); }
+ DOMNode* DOMTextImpl::getLastChild() const {return fNode.getLastChild (); }
+ const XMLCh* DOMTextImpl::getLocalName() const {return fNode.getLocalName (); }
+ const XMLCh* DOMTextImpl::getNamespaceURI() const {return fNode.getNamespaceURI (); }
+ DOMNode* DOMTextImpl::getNextSibling() const {return fChild.getNextSibling (); }
+ const XMLCh* DOMTextImpl::getNodeValue() const {return fCharacterData.getNodeValue (); }
+ DOMDocument* DOMTextImpl::getOwnerDocument() const {return fNode.getOwnerDocument (); }
+ const XMLCh* DOMTextImpl::getPrefix() const {return fNode.getPrefix (); }
+ DOMNode* DOMTextImpl::getParentNode() const {return fChild.getParentNode (this); }
+ DOMNode* DOMTextImpl::getPreviousSibling() const {return fChild.getPreviousSibling (this); }
+ bool DOMTextImpl::hasChildNodes() const {return fNode.hasChildNodes (); }
DOMNode* DOMTextImpl::insertBefore(DOMNode *newChild, DOMNode *refChild)
- {return fNode.insertBefore (newChild, refChild); };
- void DOMTextImpl::normalize() {fNode.normalize (); };
- DOMNode* DOMTextImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); };
+ {return fNode.insertBefore (newChild, refChild); }
+ void DOMTextImpl::normalize() {fNode.normalize (); }
+ DOMNode* DOMTextImpl::removeChild(DOMNode *oldChild) {return fNode.removeChild (oldChild); }
DOMNode* DOMTextImpl::replaceChild(DOMNode *newChild, DOMNode *oldChild)
- {return fNode.replaceChild (newChild, oldChild); };
+ {return fNode.replaceChild (newChild, oldChild); }
bool DOMTextImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
- {return fNode.isSupported (feature, version); };
- void DOMTextImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); };
- bool DOMTextImpl::hasAttributes() const {return fNode.hasAttributes(); };
- bool DOMTextImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); };
- bool DOMTextImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); };
+ {return fNode.isSupported (feature, version); }
+ void DOMTextImpl::setPrefix(const XMLCh *prefix) {fNode.setPrefix(prefix); }
+ bool DOMTextImpl::hasAttributes() const {return fNode.hasAttributes(); }
+ bool DOMTextImpl::isSameNode(const DOMNode* other) const {return fNode.isSameNode(other); }
+ bool DOMTextImpl::isEqualNode(const DOMNode* arg) const {return fNode.isEqualNode(arg); }
void* DOMTextImpl::setUserData(const XMLCh* key, void* data, DOMUserDataHandler* handler)
- {return fNode.setUserData(key, data, handler); };
- void* DOMTextImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); };
- const XMLCh* DOMTextImpl::getBaseURI() const {return fNode.getBaseURI(); };
- short DOMTextImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); };
- const XMLCh* DOMTextImpl::getTextContent() const {return fNode.getTextContent(); };
- void DOMTextImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); };
- const XMLCh* DOMTextImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); };
- bool DOMTextImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); };
- const XMLCh* DOMTextImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); };
- DOMNode* DOMTextImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); };
+ {return fNode.setUserData(key, data, handler); }
+ void* DOMTextImpl::getUserData(const XMLCh* key) const {return fNode.getUserData(key); }
+ const XMLCh* DOMTextImpl::getBaseURI() const {return fNode.getBaseURI(); }
+ short DOMTextImpl::compareTreePosition(const DOMNode* other) const {return fNode.compareTreePosition(other); }
+ const XMLCh* DOMTextImpl::getTextContent() const {return fNode.getTextContent(); }
+ void DOMTextImpl::setTextContent(const XMLCh* textContent){fNode.setTextContent(textContent); }
+ const XMLCh* DOMTextImpl::lookupNamespacePrefix(const XMLCh* namespaceURI, bool useDefault) const {return fNode.lookupNamespacePrefix(namespaceURI, useDefault); }
+ bool DOMTextImpl::isDefaultNamespace(const XMLCh* namespaceURI) const {return fNode.isDefaultNamespace(namespaceURI); }
+ const XMLCh* DOMTextImpl::lookupNamespaceURI(const XMLCh* prefix) const {return fNode.lookupNamespaceURI(prefix); }
+ DOMNode* DOMTextImpl::getInterface(const XMLCh* feature) {return fNode.getInterface(feature); }
@@ -245,19 +245,19 @@ void DOMTextImpl::release()
//
- const XMLCh* DOMTextImpl::getData() const {return fCharacterData.getData();};
- XMLSize_t DOMTextImpl::getLength() const {return fCharacterData.getLength();};
+ const XMLCh* DOMTextImpl::getData() const {return fCharacterData.getData();}
+ XMLSize_t DOMTextImpl::getLength() const {return fCharacterData.getLength();}
const XMLCh* DOMTextImpl::substringData(XMLSize_t offset, XMLSize_t count) const
- {return fCharacterData.substringData(this, offset, count);};
- void DOMTextImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
+ {return fCharacterData.substringData(this, offset, count);}
+ void DOMTextImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);}
void DOMTextImpl::insertData(XMLSize_t offset, const XMLCh *arg)
- {fCharacterData.insertData(this, offset, arg);};
+ {fCharacterData.insertData(this, offset, arg);}
void DOMTextImpl::deleteData(XMLSize_t offset, XMLSize_t count)
- {fCharacterData.deleteData(this, offset, count);};
+ {fCharacterData.deleteData(this, offset, count);}
void DOMTextImpl::replaceData(XMLSize_t offset, XMLSize_t count, const XMLCh *arg)
- {fCharacterData.replaceData(this, offset, count, arg);};
- void DOMTextImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
- void DOMTextImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
+ {fCharacterData.replaceData(this, offset, count, arg);}
+ void DOMTextImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);}
+ void DOMTextImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); }
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMTextImpl.hpp b/src/xercesc/dom/impl/DOMTextImpl.hpp
index ce0ac5733c983eb6ded43c47c54ac6bff1693ed6..f6009451a0cadc203a479b848c5a45121d2f160a 100644
--- a/src/xercesc/dom/impl/DOMTextImpl.hpp
+++ b/src/xercesc/dom/impl/DOMTextImpl.hpp
@@ -123,6 +123,12 @@ public:
protected:
virtual void setIgnorableWhitespace(bool ignorable);
friend class AbstractDOMParser;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMTextImpl & operator = (const DOMTextImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp b/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
index fbc3eb965f9d8c283431e7f9dce7eaf87f00b07e..c86c3ae8310ea882dc1ba499c0f7bd565c70e80e 100644
--- a/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
+++ b/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
@@ -73,21 +73,20 @@ DOMTreeWalkerImpl::DOMTreeWalkerImpl (
unsigned long whatToShow,
DOMNodeFilter* nodeFilter,
bool expandEntityRef)
-: fCurrentNode(root),
- fRoot(root),
- fWhatToShow(whatToShow),
- fNodeFilter(nodeFilter),
+: fWhatToShow(whatToShow),
+ fNodeFilter(nodeFilter),
+ fCurrentNode(root),
+ fRoot(root),
fExpandEntityReferences(expandEntityRef)
-
{
}
DOMTreeWalkerImpl::DOMTreeWalkerImpl (const DOMTreeWalkerImpl& twi)
-: fCurrentNode(twi.fCurrentNode),
- fRoot(twi.fRoot),
- fWhatToShow(twi.fWhatToShow),
+: fWhatToShow(twi.fWhatToShow),
fNodeFilter(twi.fNodeFilter),
+ fCurrentNode(twi.fCurrentNode),
+ fRoot(twi.fRoot),
fExpandEntityReferences(twi.fExpandEntityReferences)
{
}
diff --git a/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp b/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
index b1a2012c0692df244c1bcd0dfc6e8e003ee5e577..1ae086091a9889cea011ba780d20a7fb7e6ffc94 100644
--- a/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
+++ b/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
@@ -121,6 +121,11 @@ public:
const XMLCh* name;
const XMLCh* namespaceURI;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMTypeInfoImpl (const DOMTypeInfoImpl&);
+ DOMTypeInfoImpl & operator = (const DOMTypeInfoImpl &);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/dom/impl/DOMWriterImpl.cpp b/src/xercesc/dom/impl/DOMWriterImpl.cpp
index fbc0262df452676cdc8b5751f1aa3e353741bccc..7d9dbc388b529b5343b5994bc0912541ff873dad 100644
--- a/src/xercesc/dom/impl/DOMWriterImpl.cpp
+++ b/src/xercesc/dom/impl/DOMWriterImpl.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.51 2004/01/29 11:44:27 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.50 2004/01/20 23:23:57 peiyongz
* patch to Bug#25751
*
@@ -1370,7 +1373,7 @@ void DOMWriterImpl::processNode(const DOMNode* const nodeToWrite, int level)
case DOMNode::DOCUMENT_TYPE_NODE: // Not to be shown to Filter
{
- const DOMDocumentType *doctype = (const DOMDocumentType *)nodeToWrite;;
+ const DOMDocumentType *doctype = (const DOMDocumentType *)nodeToWrite;
fFormatter->setEscapeFlags(XMLFormatter::NoEscapes);
@@ -1474,7 +1477,7 @@ void DOMWriterImpl::processNode(const DOMNode* const nodeToWrite, int level)
}
-bool DOMWriterImpl::customNodeSerialize(const DOMNode* const nodeToWrite, int level) {
+bool DOMWriterImpl::customNodeSerialize(const DOMNode* const, int) {
return false;
}
@@ -1675,7 +1678,7 @@ void DOMWriterImpl::procUnrepCharInCdataSection(const XMLCh* const nodeValue
// the chars done.
//
const XMLCh* srcPtr = nodeValue;
- const XMLCh* endPtr = nodeValue + XMLString::stringLen(nodeValue);;
+ const XMLCh* endPtr = nodeValue + XMLString::stringLen(nodeValue);
// Set up the common part of the buffer that we build char refs into
XMLCh tmpBuf[32];
diff --git a/src/xercesc/dom/impl/XSDElementNSImpl.cpp b/src/xercesc/dom/impl/XSDElementNSImpl.cpp
index 1aa0a167b3e23880aab6fb83e92d619f3f8ed025..8aa3b558f01c0c3188216a356813286a600aa14d 100644
--- a/src/xercesc/dom/impl/XSDElementNSImpl.cpp
+++ b/src/xercesc/dom/impl/XSDElementNSImpl.cpp
@@ -83,14 +83,14 @@ XSDElementNSImpl::XSDElementNSImpl(DOMDocument *ownerDoc,
, fLineNo(lineNo)
, fColumnNo(columnNo)
{
-};
+}
XSDElementNSImpl::XSDElementNSImpl(const XSDElementNSImpl &other, bool deep) :
DOMElementNSImpl(other, deep)
{
this->fLineNo = other.fLineNo;
this->fColumnNo =other.fColumnNo;
-};
+}
DOMNode * XSDElementNSImpl::cloneNode(bool deep) const {
DOMNode* newNode = new (getOwnerDocument()) XSDElementNSImpl(*this, deep);
diff --git a/src/xercesc/dom/impl/XSDElementNSImpl.hpp b/src/xercesc/dom/impl/XSDElementNSImpl.hpp
index 779ff9e35808713d61bc8ad8c9f59b17926eb32b..c68106d57f89297b2137219e5d638f969bec4ecc 100644
--- a/src/xercesc/dom/impl/XSDElementNSImpl.hpp
+++ b/src/xercesc/dom/impl/XSDElementNSImpl.hpp
@@ -97,6 +97,12 @@ public:
XMLSSize_t getLineNo() const { return fLineNo; }
XMLSSize_t getColumnNo() const { return fColumnNo; }
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XSDElementNSImpl& operator=(const XSDElementNSImpl&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/LocalFileInputSource.hpp b/src/xercesc/framework/LocalFileInputSource.hpp
index b53de57a22e5074db7fb2a155d50b6c23366c7af..8d46fca514e63c92a5627ef3681c5587eb091a33 100644
--- a/src/xercesc/framework/LocalFileInputSource.hpp
+++ b/src/xercesc/framework/LocalFileInputSource.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/12/01 23:23:25 neilg
* fix for bug 25118; thanks to Jeroen Witmond
*
@@ -220,6 +223,13 @@ public :
virtual BinInputStream* makeStream() const;
//@}
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ LocalFileInputSource(const LocalFileInputSource&);
+ LocalFileInputSource& operator=(const LocalFileInputSource&);
+
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/MemBufFormatTarget.cpp b/src/xercesc/framework/MemBufFormatTarget.cpp
index 612096243ea318aedd0b344e2797dd46d5a5db96..7e016101e8589b33a30e8c36d0210c69b45b3eb7 100644
--- a/src/xercesc/framework/MemBufFormatTarget.cpp
+++ b/src/xercesc/framework/MemBufFormatTarget.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/05/16 21:36:55 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -111,7 +114,7 @@ MemBufFormatTarget::~MemBufFormatTarget()
void MemBufFormatTarget::writeChars(const XMLByte* const toWrite
, const unsigned int count
- , XMLFormatter * const formatter)
+ , XMLFormatter * const)
{
if (count) {
diff --git a/src/xercesc/framework/MemBufInputSource.hpp b/src/xercesc/framework/MemBufInputSource.hpp
index 0b5fa413ab1c0a25cc4fbf53134d92f88f800e0f..c17be714ea3d7b4e249211400dd4588183447988 100644
--- a/src/xercesc/framework/MemBufInputSource.hpp
+++ b/src/xercesc/framework/MemBufInputSource.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/01 23:23:25 neilg
* fix for bug 25118; thanks to Jeroen Witmond
*
@@ -255,6 +258,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ MemBufInputSource(const MemBufInputSource&);
+ MemBufInputSource& operator=(const MemBufInputSource&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/framework/StdInInputSource.hpp b/src/xercesc/framework/StdInInputSource.hpp
index a748f0ec5c3cc3ab5713b1ade711bdc7cd011def..f71bba3c0ae1d4e9a84bcf079ebc6a80d72b5138 100644
--- a/src/xercesc/framework/StdInInputSource.hpp
+++ b/src/xercesc/framework/StdInInputSource.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/16 21:36:55 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -156,6 +159,14 @@ public :
BinInputStream* makeStream() const;
//@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ StdInInputSource(const StdInInputSource&);
+ StdInInputSource& operator=(const StdInInputSource&);
+
};
inline StdInInputSource::StdInInputSource(MemoryManager* const manager) :
diff --git a/src/xercesc/framework/StdOutFormatTarget.cpp b/src/xercesc/framework/StdOutFormatTarget.cpp
index 585cf8cb593df2a75c8e4c3a341753c4f43b5b5e..eecb6b64ad53a3be16ef0d71e773abcdf2a06503 100644
--- a/src/xercesc/framework/StdOutFormatTarget.cpp
+++ b/src/xercesc/framework/StdOutFormatTarget.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/05/29 11:18:37 gareth
* Added macros in so we can determine whether to do things like iostream as opposed to iostream.h and whether to use std:: or not.
*
@@ -105,7 +108,7 @@ void StdOutFormatTarget::flush()
void StdOutFormatTarget::writeChars(const XMLByte* const toWrite
, const unsigned int count
- , XMLFormatter* const formatter)
+ , XMLFormatter* const)
{
// Surprisingly, Solaris was the only platform on which
// required the char* cast to print out the string correctly.
diff --git a/src/xercesc/framework/URLInputSource.hpp b/src/xercesc/framework/URLInputSource.hpp
index f4b8e54ff2ec9791e3f4c86e582db381440b6a74..e9119ecafae09cb3878a6e986f5d66e441a40a9a 100644
--- a/src/xercesc/framework/URLInputSource.hpp
+++ b/src/xercesc/framework/URLInputSource.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/12/01 23:23:25 neilg
* fix for bug 25118; thanks to Jeroen Witmond
*
@@ -297,6 +300,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ URLInputSource(const URLInputSource&);
+ URLInputSource& operator=(const URLInputSource&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/framework/XMLAttDefList.cpp b/src/xercesc/framework/XMLAttDefList.cpp
index f55bb1412a53556574e5657af8fbb05e7c909822..ab701a581a0a9f05262302d910804bc41a86bb3c 100644
--- a/src/xercesc/framework/XMLAttDefList.cpp
+++ b/src/xercesc/framework/XMLAttDefList.cpp
@@ -57,6 +57,9 @@
/**
* $Id$
* $Log$
+ * Revision 1.2 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.1 2003/10/10 16:23:29 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -76,7 +79,7 @@ XERCES_CPP_NAMESPACE_BEGIN
IMPL_XSERIALIZABLE_NOCREATE(XMLAttDefList)
-void XMLAttDefList::serialize(XSerializeEngine& serEng)
+void XMLAttDefList::serialize(XSerializeEngine&)
{
//no data
}
diff --git a/src/xercesc/framework/XMLAttDefList.hpp b/src/xercesc/framework/XMLAttDefList.hpp
index 5da0b0f1e56a9f95523d33700dc9612c9cf05dad..1ec312cab21d78e690a326702c1c24e3171ef2c2 100644
--- a/src/xercesc/framework/XMLAttDefList.hpp
+++ b/src/xercesc/framework/XMLAttDefList.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/11/10 21:53:54 neilg
* add a means of statelessly traversing attribute lists. mark the enumeration-based means as deprecated, since those are not stateless
*
@@ -219,11 +222,12 @@ protected :
// Hidden constructors and operators
// -----------------------------------------------------------------------
XMLAttDefList(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+
+private:
+ // unimplemented
XMLAttDefList(const XMLAttDefList&);
XMLAttDefList& operator=(const XMLAttDefList&);
-
-private:
MemoryManager* fMemoryManager;
};
@@ -247,22 +251,13 @@ inline XMLAttDefList::~XMLAttDefList()
// ---------------------------------------------------------------------------
-// XMLAttDefList: Hidden Constructors and Operators
+// XMLAttDefList: Protected Constructor
// ---------------------------------------------------------------------------
inline XMLAttDefList::XMLAttDefList(MemoryManager* const manager):
fMemoryManager(manager)
{
}
-inline XMLAttDefList::XMLAttDefList(const XMLAttDefList&)
-{
-}
-
-inline XMLAttDefList& XMLAttDefList::operator=(const XMLAttDefList&)
-{
- return *this;
-}
-
XERCES_CPP_NAMESPACE_END
#endif
diff --git a/src/xercesc/framework/XMLBuffer.hpp b/src/xercesc/framework/XMLBuffer.hpp
index 613e452d66aa7f0adbd564fcb375119d07aec093..9ca65c61f792ebc329248f0d22ac0353ccb7722f 100644
--- a/src/xercesc/framework/XMLBuffer.hpp
+++ b/src/xercesc/framework/XMLBuffer.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 21:36:55 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -222,6 +225,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLBuffer(const XMLBuffer&);
+ XMLBuffer& operator=(const XMLBuffer&);
+
// -----------------------------------------------------------------------
// Declare our friends
// -----------------------------------------------------------------------
diff --git a/src/xercesc/framework/XMLBufferMgr.hpp b/src/xercesc/framework/XMLBufferMgr.hpp
index 756160cf27ea760e10c773c1b63cf146f6993a6a..408248814876a01d76781dc7f030348b0411b90e 100644
--- a/src/xercesc/framework/XMLBufferMgr.hpp
+++ b/src/xercesc/framework/XMLBufferMgr.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/05/16 21:36:55 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -140,6 +143,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLBufferMgr(const XMLBufferMgr&);
+ XMLBufferMgr& operator=(const XMLBufferMgr&);
+
// -----------------------------------------------------------------------
// Private data members
//
@@ -238,6 +247,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLBufBid(const XMLBufBid&);
+ XMLBufBid& operator=(const XMLBufBid&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/framework/XMLDocumentHandler.hpp b/src/xercesc/framework/XMLDocumentHandler.hpp
index 2754dfdfd299c1e4cc821d2f208283a5914fff5f..6d976ed38e8837c3bb9c6776f7958f2e8ebac38e 100644
--- a/src/xercesc/framework/XMLDocumentHandler.hpp
+++ b/src/xercesc/framework/XMLDocumentHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/11/28 05:14:34 neilg
* update XMLDocumentHandler to enable stateless passing of type information for elements. Note that this is as yet unimplemented.
*
@@ -365,8 +368,8 @@ public:
*/
virtual void elementTypeInfo
(
- const XMLCh* const typeName
- , const XMLCh* const typeURI
+ const XMLCh* const
+ , const XMLCh* const
) { /* non pure virtual to permit backward compatibility of implementations. */ };
//@}
diff --git a/src/xercesc/framework/XMLElementDecl.cpp b/src/xercesc/framework/XMLElementDecl.cpp
index 9eb1b3dc33d9cc56d4a8e05783393d090c96b7fe..e9c360c2e2b895d0b9bc28605651585e98b1ad20 100644
--- a/src/xercesc/framework/XMLElementDecl.cpp
+++ b/src/xercesc/framework/XMLElementDecl.cpp
@@ -195,17 +195,14 @@ XMLElementDecl::loadElementDecl(XSerializeEngine& serEng)
SchemaElementDecl* schemaElementDecl;
serEng>>schemaElementDecl;
return schemaElementDecl;
- break;
case DTD:
DTDElementDecl* dtdElementDecl;
serEng>>dtdElementDecl;
return dtdElementDecl;
- break;
case UnKnown:
//fall through
default:
return 0;
- break;
}
}
diff --git a/src/xercesc/framework/XMLErrorCodes.hpp b/src/xercesc/framework/XMLErrorCodes.hpp
index 668d857c080196e7eb62833af08fad22abf79746..39cf546409be0944a605c131b300df2dffca8268 100644
--- a/src/xercesc/framework/XMLErrorCodes.hpp
+++ b/src/xercesc/framework/XMLErrorCodes.hpp
@@ -357,6 +357,12 @@ public :
return DOMError::DOM_SEVERITY_FATAL_ERROR;
else return DOMError::DOM_SEVERITY_ERROR;
}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLErrs();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/XMLFormatter.hpp b/src/xercesc/framework/XMLFormatter.hpp
index 78af173e9219dfddac715e1ee82a3407d9133e26..0aec540c05b7e08b2695727149c3f77e737ac85e 100644
--- a/src/xercesc/framework/XMLFormatter.hpp
+++ b/src/xercesc/framework/XMLFormatter.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.19 2003/12/01 23:23:25 neilg
* fix for bug 25118; thanks to Jeroen Witmond
*
@@ -571,9 +574,14 @@ protected :
// -----------------------------------------------------------------------
// Hidden constructors and operators
// -----------------------------------------------------------------------
- XMLFormatTarget() {}
- XMLFormatTarget(const XMLFormatTarget&) {}
- void operator=(const XMLFormatTarget&) {}
+ XMLFormatTarget() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLFormatTarget(const XMLFormatTarget&);
+ XMLFormatTarget& operator=(const XMLFormatTarget&);
};
diff --git a/src/xercesc/framework/XMLGrammarDescription.cpp b/src/xercesc/framework/XMLGrammarDescription.cpp
index 144985fec045bf2b6787f4bf972d670530058214..962e8613fde42e021187d45e890a8ddea356b4d7 100644
--- a/src/xercesc/framework/XMLGrammarDescription.cpp
+++ b/src/xercesc/framework/XMLGrammarDescription.cpp
@@ -57,6 +57,9 @@
/**
* $Id$
* $Log$
+ * Revision 1.2 2004/01/29 11:46:29 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.1 2003/10/14 15:16:58 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -85,7 +88,7 @@ XMLGrammarDescription::XMLGrammarDescription(MemoryManager* const memMgr)
IMPL_XSERIALIZABLE_NOCREATE(XMLGrammarDescription)
-void XMLGrammarDescription::serialize(XSerializeEngine& serEng)
+void XMLGrammarDescription::serialize(XSerializeEngine&)
{
//no data
}
diff --git a/src/xercesc/framework/XMLRecognizer.hpp b/src/xercesc/framework/XMLRecognizer.hpp
index 408013335b2f55d709b2ba619e0d6e66dae64108..07f911c3600a837a3989e6af965cdb68ae95907d 100644
--- a/src/xercesc/framework/XMLRecognizer.hpp
+++ b/src/xercesc/framework/XMLRecognizer.hpp
@@ -173,6 +173,12 @@ protected :
// -----------------------------------------------------------------------
XMLRecognizer();
~XMLRecognizer();
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLRecognizer(const XMLRecognizer&);
XMLRecognizer& operator=(const XMLRecognizer&);
};
diff --git a/src/xercesc/framework/XMLValidityCodes.hpp b/src/xercesc/framework/XMLValidityCodes.hpp
index 665455ad1bd383f9decdf377d301633308f1845d..e1a4f9a17f44223d49eadaf84d6c3fe67dfe821e 100644
--- a/src/xercesc/framework/XMLValidityCodes.hpp
+++ b/src/xercesc/framework/XMLValidityCodes.hpp
@@ -163,6 +163,12 @@ public :
return DOMError::DOM_SEVERITY_FATAL_ERROR;
else return DOMError::DOM_SEVERITY_ERROR;
}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLValid();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/psvi/PSVIAttribute.cpp b/src/xercesc/framework/psvi/PSVIAttribute.cpp
index 4d86fab0153aa48973c5a9c26438f234d34c2306..9dd483c3d4902c76661f0416992c89955662ce77 100644
--- a/src/xercesc/framework/psvi/PSVIAttribute.cpp
+++ b/src/xercesc/framework/psvi/PSVIAttribute.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/30 05:58:56 neilg
* allow schema normalized values to be associated with a PSVIAttribute after it is reset
*
@@ -87,8 +90,9 @@
XERCES_CPP_NAMESPACE_BEGIN
PSVIAttribute::PSVIAttribute( MemoryManager* const manager ):
- PSVIItem(manager),
- fAttributeDecl(0)
+ PSVIItem(manager)
+ , fAttributeDecl(0)
+ , fDV(0)
{
}
diff --git a/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp b/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp
index d7f379239793d66473a5e7f188170d41bc860121..de74b5e67035b7d1e051c55101519428a531e0ee 100644
--- a/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp
+++ b/src/xercesc/framework/psvi/XSAttributeDeclaration.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2004/01/06 03:55:26 knoaman
* Various PSVI fixes.
*
@@ -119,8 +122,9 @@ XSAttributeDeclaration::XSAttributeDeclaration(SchemaAttDef* const att
, fAttDef(attDef)
, fTypeDefinition(typeDef)
, fAnnotation(annot)
+ , fId(0)
, fScope(scope)
- , fEnclosingCTDefinition(enclosingCTDefinition)
+ , fEnclosingCTDefinition(enclosingCTDefinition)
{
}
diff --git a/src/xercesc/framework/psvi/XSComplexTypeDefinition.cpp b/src/xercesc/framework/psvi/XSComplexTypeDefinition.cpp
index 75fe019c0e14d933eeafad1ec24edefbdadbf4fc..532cd6db96349bcfab9e6fbfb87216e82103c300 100644
--- a/src/xercesc/framework/psvi/XSComplexTypeDefinition.cpp
+++ b/src/xercesc/framework/psvi/XSComplexTypeDefinition.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/12/24 17:42:02 knoaman
* Misc. PSVI updates
*
@@ -184,12 +187,9 @@ XSComplexTypeDefinition::~XSComplexTypeDefinition()
// ---------------------------------------------------------------------------
XSConstants::DERIVATION_TYPE XSComplexTypeDefinition::getDerivationMethod() const
{
- switch(fComplexTypeInfo->getDerivedBy()) {
- case SchemaSymbols::XSD_EXTENSION:
- return XSConstants::DERIVATION_EXTENSION;
- default:
- return XSConstants::DERIVATION_RESTRICTION;
- }
+ if(fComplexTypeInfo->getDerivedBy() == SchemaSymbols::XSD_EXTENSION)
+ return XSConstants::DERIVATION_EXTENSION;
+ return XSConstants::DERIVATION_RESTRICTION;
}
bool XSComplexTypeDefinition::getAbstract() const
diff --git a/src/xercesc/framework/psvi/XSConstants.hpp b/src/xercesc/framework/psvi/XSConstants.hpp
index b6937194393a3ce32b47237d39bed97a34798a12..a4fa1219ba8b7aef658d3a13fad04df6a5569587 100644
--- a/src/xercesc/framework/psvi/XSConstants.hpp
+++ b/src/xercesc/framework/psvi/XSConstants.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/11/06 15:30:04 neilg
* first part of PSVI/schema component model implementation, thanks to David Cargill. This covers setting the PSVIHandler on parser objects, as well as implementing XSNotation, XSSimpleTypeDefinition, XSIDCDefinition, and most of XSWildcard, XSComplexTypeDefinition, XSElementDeclaration, XSAttributeDeclaration and XSAttributeUse.
*
@@ -228,6 +231,12 @@ public:
*/
VC_FIXED = 2
};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XSConstants();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/framework/psvi/XSIDCDefinition.cpp b/src/xercesc/framework/psvi/XSIDCDefinition.cpp
index 9a6fc269fbb253c1483d175646e0d74560f1530e..55e1e4075bf63616ec311d8519ea663239194bfa 100644
--- a/src/xercesc/framework/psvi/XSIDCDefinition.cpp
+++ b/src/xercesc/framework/psvi/XSIDCDefinition.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/15 17:23:48 cargilld
* psvi updates; cleanup revisits and bug fixes
*
@@ -141,7 +144,7 @@ const XMLCh *XSIDCDefinition::getName()
const XMLCh *XSIDCDefinition::getNamespace()
{
- return fXSModel->getURIStringPool()->getValueForId(fIdentityConstraint->getNamespaceURI());;
+ return fXSModel->getURIStringPool()->getValueForId(fIdentityConstraint->getNamespaceURI());
}
XSNamespaceItem *XSIDCDefinition::getNamespaceItem()
diff --git a/src/xercesc/framework/psvi/XSModel.cpp b/src/xercesc/framework/psvi/XSModel.cpp
index 5ef0002721076a88d380e47404844870305eb369..3c20ace84a61f1ece7b3d169f03398ee4790bd25 100644
--- a/src/xercesc/framework/psvi/XSModel.cpp
+++ b/src/xercesc/framework/psvi/XSModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.18 2004/01/06 19:07:16 knoaman
* Fix segfault when adding S4S
*
@@ -260,10 +263,10 @@ XSModel::XSModel( XSModel *baseModel
, fAttributeDeclarationVector(0)
, fURIStringPool(0)
, fXSAnnotationList(0)
- , fHashNamespace(0)
- , fParent(baseModel)
+ , fHashNamespace(0)
, fObjFactory(0)
, fDeleteNamespace(0)
+ , fParent(baseModel)
, fDeleteParent(true)
, fAddedS4SGrammar(false)
{
diff --git a/src/xercesc/framework/psvi/XSNamedMap.hpp b/src/xercesc/framework/psvi/XSNamedMap.hpp
index d4f849ce1da3e19eb4965ca65df1c509ced50bcd..99ca337f27a2ebac6ad3340d7cf4bbc5544d4cdf 100644
--- a/src/xercesc/framework/psvi/XSNamedMap.hpp
+++ b/src/xercesc/framework/psvi/XSNamedMap.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/11/06 15:30:04 neilg
* first part of PSVI/schema component model implementation, thanks to David Cargill. This covers setting the PSVIHandler on parser objects, as well as implementing XSNotation, XSSimpleTypeDefinition, XSIDCDefinition, and most of XSWildcard, XSComplexTypeDefinition, XSElementDeclaration, XSAttributeDeclaration and XSAttributeUse.
*
@@ -155,8 +158,10 @@ public:
private :
// -----------------------------------------------------------------------
- // Private methods
+ // Unimplemented constructors and operators
// -----------------------------------------------------------------------
+ XSNamedMap(const XSNamedMap<TVal>&);
+ XSNamedMap<TVal>& operator=(const XSNamedMap<TVal>&);
// -----------------------------------------------------------------------
// Data members
diff --git a/src/xercesc/framework/psvi/XSTypeDefinition.cpp b/src/xercesc/framework/psvi/XSTypeDefinition.cpp
index 650c0863bbb004a6c7562caf504450a0e0ae7652..8ed4399425325e49b50a648690b6538daa652da7 100644
--- a/src/xercesc/framework/psvi/XSTypeDefinition.cpp
+++ b/src/xercesc/framework/psvi/XSTypeDefinition.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/24 15:25:07 cargilld
* Improved algorithm for finding derivedFrom.
*
@@ -102,9 +105,9 @@ XSTypeDefinition::XSTypeDefinition(TYPE_CATEGORY typeCategory,
XSModel* const xsModel,
MemoryManager* const manager)
: XSObject(XSConstants::TYPE_DEFINITION, xsModel, manager)
- , fFinal(0)
- , fBaseType(xsBaseType)
, fTypeCategory(typeCategory)
+ , fFinal(0)
+ , fBaseType(xsBaseType)
{
}
diff --git a/src/xercesc/internal/BinFileOutputStream.hpp b/src/xercesc/internal/BinFileOutputStream.hpp
index f401108b566d70ec4086804318f91fda68c730e6..c0e90e79c62b66ac834c3761ef0de0a62dd93624 100644
--- a/src/xercesc/internal/BinFileOutputStream.hpp
+++ b/src/xercesc/internal/BinFileOutputStream.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/12/17 13:58:02 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -116,6 +119,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinFileOutputStream(const BinFileOutputStream&);
+ BinFileOutputStream& operator=(const BinFileOutputStream&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/internal/DGXMLScanner.cpp b/src/xercesc/internal/DGXMLScanner.cpp
index 8e6382b89816849408c0addd829503280ca16e3e..ef84d512494bb1329cfdeb1ee8c9da203f097e0e 100644
--- a/src/xercesc/internal/DGXMLScanner.cpp
+++ b/src/xercesc/internal/DGXMLScanner.cpp
@@ -222,7 +222,7 @@ void DGXMLScanner::scanDocument(const InputSource& src)
else
{
// Scan content, and tell it its not an external entity
- if (scanContent(false))
+ if (scanContent())
{
// Do post-parse validation if required
if (fValidate)
@@ -514,7 +514,7 @@ bool DGXMLScanner::scanNext(XMLPScanToken& token)
// This method will kick off the scanning of the primary content of the
// document, i.e. the elements.
-bool DGXMLScanner::scanContent(const bool extEntity)
+bool DGXMLScanner::scanContent()
{
// Go into a loop until we hit the end of the root element, or we fall
// out because there is no root element.
diff --git a/src/xercesc/internal/DGXMLScanner.hpp b/src/xercesc/internal/DGXMLScanner.hpp
index 13f94d1a74703db8352e05d0caef1282678693de..873855c3d4c201db097c5df884a4358c1db386d1 100644
--- a/src/xercesc/internal/DGXMLScanner.hpp
+++ b/src/xercesc/internal/DGXMLScanner.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/11/24 05:09:39 neilg
* implement new, statless, method for detecting duplicate attributes
*
@@ -216,7 +219,7 @@ private :
, const XMLCh *const attrName
, XMLBuffer& toFill
);
- bool scanContent(const bool extEntity);
+ bool scanContent();
void scanEndTag(bool& gotData);
bool scanStartTag(bool& gotData);
bool scanStartTagNS(bool& gotData);
diff --git a/src/xercesc/internal/EndOfEntityException.hpp b/src/xercesc/internal/EndOfEntityException.hpp
index 23e4f8db3c3af89c38ad62832111b8d58dc29e05..fa55919236da5610a93b9d1e5c85d6f7deeab30b 100644
--- a/src/xercesc/internal/EndOfEntityException.hpp
+++ b/src/xercesc/internal/EndOfEntityException.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2002/11/04 14:58:18 tng
* C++ Namespace Support.
*
@@ -129,6 +132,11 @@ public:
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ EndOfEntityException& operator = (const EndOfEntityException&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/internal/IGXMLScanner.cpp b/src/xercesc/internal/IGXMLScanner.cpp
index fe2b2d2b7c02f7c96c428cc2f4b7bb903d115684..039faf0e0c1673baad27e9f5121dac67afc09c75 100644
--- a/src/xercesc/internal/IGXMLScanner.cpp
+++ b/src/xercesc/internal/IGXMLScanner.cpp
@@ -99,6 +99,7 @@ IGXMLScanner::IGXMLScanner( XMLValidator* const valToAdopt
XMLScanner(valToAdopt, grammarResolver, manager)
, fSeeXsi(false)
+ , fGrammarType(Grammar::UnKnown)
, fElemStateSize(16)
, fElemState(0)
, fContent(1023, manager)
@@ -109,6 +110,7 @@ IGXMLScanner::IGXMLScanner( XMLValidator* const valToAdopt
, fMatcherStack(0)
, fValueStoreCache(0)
, fFieldActivator(0)
+ , fLocationPairs(0)
, fDTDElemNonDeclPool(0)
, fSchemaElemNonDeclPool(0)
, fElemCount(0)
@@ -118,7 +120,7 @@ IGXMLScanner::IGXMLScanner( XMLValidator* const valToAdopt
, fPSVIAttrList(0)
, fModel(0)
, fPSVIElement(0)
- , fErrorStack(0)
+ , fErrorStack(0)
{
try
{
@@ -149,6 +151,7 @@ IGXMLScanner::IGXMLScanner( XMLDocumentHandler* const docHandler
XMLScanner(docHandler, docTypeHandler, entityHandler, errHandler, valToAdopt, grammarResolver, manager)
, fSeeXsi(false)
+ , fGrammarType(Grammar::UnKnown)
, fElemStateSize(16)
, fElemState(0)
, fContent(1023, manager)
@@ -159,6 +162,7 @@ IGXMLScanner::IGXMLScanner( XMLDocumentHandler* const docHandler
, fMatcherStack(0)
, fValueStoreCache(0)
, fFieldActivator(0)
+ , fLocationPairs(0)
, fDTDElemNonDeclPool(0)
, fSchemaElemNonDeclPool(0)
, fElemCount(0)
@@ -168,7 +172,7 @@ IGXMLScanner::IGXMLScanner( XMLDocumentHandler* const docHandler
, fPSVIAttrList(0)
, fModel(0)
, fPSVIElement(0)
- , fErrorStack(0)
+ , fErrorStack(0)
{
try
{
@@ -244,7 +248,7 @@ void IGXMLScanner::scanDocument(const InputSource& src)
else
{
// Scan content, and tell it its not an external entity
- if (scanContent(false))
+ if (scanContent())
{
// Do post-parse validation if required
if (fValidate)
@@ -851,7 +855,7 @@ IGXMLScanner::rawAttrScan(const XMLCh* const elemName
// This method will kick off the scanning of the primary content of the
// document, i.e. the elements.
-bool IGXMLScanner::scanContent(const bool extEntity)
+bool IGXMLScanner::scanContent()
{
// Go into a loop until we hit the end of the root element, or we fall
// out because there is no root element.
@@ -2289,7 +2293,7 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
if (attCount)
- scanRawAttrListforNameSpaces(fRawAttrList, attCount);
+ scanRawAttrListforNameSpaces(attCount);
// Also find any default or fixed xmlns attributes in DTD defined for
// this element.
@@ -2557,8 +2561,7 @@ bool IGXMLScanner::scanStartTagNS(bool& gotData)
// go to original Grammar again to see if element needs to be fully qualified.
bool errorCondition = !switchGrammar(original_uriStr) && fValidate;
if (errorCondition && !laxThisOne)
- {
- const XMLCh* uriStr = getURIText(orgGrammarUri);
+ {
fValidator->emitError
(
XMLValid::GrammarNotFound
diff --git a/src/xercesc/internal/IGXMLScanner.hpp b/src/xercesc/internal/IGXMLScanner.hpp
index c18ea971650ce2f4ad837981ef2ddf446a13a9c8..e66520f1c6ece618679e736fab0d6cd403259f17 100644
--- a/src/xercesc/internal/IGXMLScanner.hpp
+++ b/src/xercesc/internal/IGXMLScanner.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.18 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.17 2003/11/28 19:54:31 knoaman
* PSVIElement update
*
@@ -262,7 +265,7 @@ private :
const XMLCh* const attrName
, const XMLCh* const attrValue
);
- void scanRawAttrListforNameSpaces(const RefVectorOf<KVStringPair>* theRawAttrList, int attCount);
+ void scanRawAttrListforNameSpaces(int attCount);
void parseSchemaLocation(const XMLCh* const schemaLocationStr);
void resolveSchemaGrammar(const XMLCh* const loc, const XMLCh* const uri);
bool switchGrammar(const XMLCh* const newGrammarNameSpace);
@@ -296,7 +299,7 @@ private :
, const XMLCh* const attrName
, XMLBuffer& toFill
);
- bool scanContent(const bool extEntity);
+ bool scanContent();
void scanEndTag(bool& gotData);
bool scanStartTag(bool& gotData);
bool scanStartTagNS(bool& gotData);
diff --git a/src/xercesc/internal/IGXMLScanner2.cpp b/src/xercesc/internal/IGXMLScanner2.cpp
index 36178286a1f54b5bc4f5b0107ee63d34f172b5b5..7d7058d07012a18c7b5e5594f1ee8e414676cfb6 100644
--- a/src/xercesc/internal/IGXMLScanner2.cpp
+++ b/src/xercesc/internal/IGXMLScanner2.cpp
@@ -1587,7 +1587,7 @@ void IGXMLScanner::updateNSMap(const XMLCh* const attrName
);
}
-void IGXMLScanner::scanRawAttrListforNameSpaces(const RefVectorOf<KVStringPair>* theRawAttrList, int attCount)
+void IGXMLScanner::scanRawAttrListforNameSpaces(int attCount)
{
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
diff --git a/src/xercesc/internal/ReaderMgr.cpp b/src/xercesc/internal/ReaderMgr.cpp
index ef7a41bfba02c7c86e4a906ba2951957d24967d5..e56551c87708ef809cd25b56920dac9147697b03 100644
--- a/src/xercesc/internal/ReaderMgr.cpp
+++ b/src/xercesc/internal/ReaderMgr.cpp
@@ -413,7 +413,7 @@ void ReaderMgr::cleanStackBackTo(const unsigned int readerNum)
XMLReader* ReaderMgr::createReader( const InputSource& src
- , const bool xmlDecl
+ , const bool
, const XMLReader::RefFrom refFrom
, const XMLReader::Types type
, const XMLReader::Sources source
diff --git a/src/xercesc/internal/ReaderMgr.hpp b/src/xercesc/internal/ReaderMgr.hpp
index 6e861a09583098339cb98b5445c8d4ff4bccde6d..05905f45c6096ca519063dd881e4a68b47492566 100644
--- a/src/xercesc/internal/ReaderMgr.hpp
+++ b/src/xercesc/internal/ReaderMgr.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/08/14 02:56:41 knoaman
* Code refactoring to improve performance of validation.
*
@@ -319,6 +322,11 @@ private :
const XMLReader* getLastExtEntity(const XMLEntityDecl*& itsEntity) const;
bool popReader();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ReaderMgr(const ReaderMgr&);
+ ReaderMgr& operator=(const ReaderMgr&);
// -----------------------------------------------------------------------
// Private data members
@@ -524,6 +532,12 @@ public :
};
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ThrowEOEJanitor(const ThrowEOEJanitor&);
+ ThrowEOEJanitor& operator=(const ThrowEOEJanitor&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/internal/SGXMLScanner.cpp b/src/xercesc/internal/SGXMLScanner.cpp
index 41f7b6fc3c9aa44660c66414b3af9d59524d7724..2a893a74648eefc76ae84c30e81909ffaab41ca8 100644
--- a/src/xercesc/internal/SGXMLScanner.cpp
+++ b/src/xercesc/internal/SGXMLScanner.cpp
@@ -103,11 +103,13 @@ SGXMLScanner::SGXMLScanner( XMLValidator* const valToAdopt
XMLScanner(valToAdopt, grammarResolver, manager)
, fSeeXsi(false)
+ , fGrammarType(Grammar::UnKnown)
, fElemStateSize(16)
, fElemState(0)
, fContent(1023, manager)
, fEntityTable(0)
, fRawAttrList(0)
+ , fSchemaGrammar(0)
, fSchemaValidator(0)
, fMatcherStack(0)
, fValueStoreCache(0)
@@ -119,7 +121,7 @@ SGXMLScanner::SGXMLScanner( XMLValidator* const valToAdopt
, fPSVIAttrList(0)
, fModel(0)
, fPSVIElement(0)
- , fErrorStack(0)
+ , fErrorStack(0)
{
try
{
@@ -156,11 +158,13 @@ SGXMLScanner::SGXMLScanner( XMLDocumentHandler* const docHandler
XMLScanner(docHandler, docTypeHandler, entityHandler, errHandler, valToAdopt, grammarResolver, manager)
, fSeeXsi(false)
+ , fGrammarType(Grammar::UnKnown)
, fElemStateSize(16)
, fElemState(0)
, fContent(1023, manager)
, fEntityTable(0)
, fRawAttrList(0)
+ , fSchemaGrammar(0)
, fSchemaValidator(0)
, fMatcherStack(0)
, fValueStoreCache(0)
@@ -172,7 +176,7 @@ SGXMLScanner::SGXMLScanner( XMLDocumentHandler* const docHandler
, fPSVIAttrList(0)
, fModel(0)
, fPSVIElement(0)
- , fErrorStack(0)
+ , fErrorStack(0)
{
try
{
@@ -250,7 +254,7 @@ void SGXMLScanner::scanDocument(const InputSource& src)
else
{
// Scan content, and tell it its not an external entity
- if (scanContent(false))
+ if (scanContent())
{
// Do post-parse validation if required
if (fValidate)
@@ -777,7 +781,7 @@ SGXMLScanner::rawAttrScan(const XMLCh* const elemName
// This method will kick off the scanning of the primary content of the
// document, i.e. the elements.
-bool SGXMLScanner::scanContent(const bool extEntity)
+bool SGXMLScanner::scanContent()
{
// Go into a loop until we hit the end of the root element, or we fall
// out because there is no root element.
@@ -1247,7 +1251,6 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
, *fRawAttrList
, isEmpty
);
- const bool gotAttrs = (attCount != 0);
// save the contentleafname and currentscope before addlevel, for later use
ContentLeafNameTypeVector* cv = 0;
@@ -1308,7 +1311,7 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
if (attCount)
- scanRawAttrListforNameSpaces(fRawAttrList, attCount);
+ scanRawAttrListforNameSpaces(attCount);
// Resolve the qualified name to a URI and name so that we can look up
// the element decl for this element. We have now update the prefix to
@@ -1504,7 +1507,6 @@ bool SGXMLScanner::scanStartTag(bool& gotData)
if (!elemDecl && orgGrammarUri != fEmptyNamespaceId) {
// still Not found in specified uri
// go to original Grammar again to see if element needs to be fully qualified.
- const XMLCh* uriStr = getURIText(orgGrammarUri);
bool errorCondition = !switchGrammar(original_uriStr) && fValidate;
if (errorCondition && !laxThisOne)
{
@@ -3623,7 +3625,7 @@ void SGXMLScanner::updateNSMap(const XMLCh* const attrName
);
}
-void SGXMLScanner::scanRawAttrListforNameSpaces(const RefVectorOf<KVStringPair>* theRawAttrList, int attCount)
+void SGXMLScanner::scanRawAttrListforNameSpaces(int attCount)
{
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
@@ -4596,7 +4598,7 @@ void SGXMLScanner::scanCharData(XMLBuffer& toUse)
// only makes any difference if the return value indicates the value was
// returned directly.
SGXMLScanner::EntityExpRes
-SGXMLScanner::scanEntityRef( const bool inAttVal
+SGXMLScanner::scanEntityRef( const bool
, XMLCh& firstCh
, XMLCh& secondCh
, bool& escaped)
diff --git a/src/xercesc/internal/SGXMLScanner.hpp b/src/xercesc/internal/SGXMLScanner.hpp
index a43c01f585c0a380131e5528f92ba18ccdbbcb80..545156239e0d7e084d1afeb6481c05b23e67ceb6 100644
--- a/src/xercesc/internal/SGXMLScanner.hpp
+++ b/src/xercesc/internal/SGXMLScanner.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.15 2003/11/28 19:54:31 knoaman
* PSVIElement update
*
@@ -252,7 +255,7 @@ private :
const XMLCh* const attrName
, const XMLCh* const attrValue
);
- void scanRawAttrListforNameSpaces(const RefVectorOf<KVStringPair>* theRawAttrList, int attCount);
+ void scanRawAttrListforNameSpaces(int attCount);
void parseSchemaLocation(const XMLCh* const schemaLocationStr);
void resolveSchemaGrammar(const XMLCh* const loc, const XMLCh* const uri);
bool switchGrammar(const XMLCh* const newGrammarNameSpace);
@@ -284,7 +287,7 @@ private :
const XMLAttDef* const attDef
, XMLBuffer& toFill
);
- bool scanContent(const bool extEntity);
+ bool scanContent();
void scanEndTag(bool& gotData);
bool scanStartTag(bool& gotData);
diff --git a/src/xercesc/internal/WFXMLScanner.cpp b/src/xercesc/internal/WFXMLScanner.cpp
index f0b50fc5dc901ccd196204c3547c947d99b2ab85..fae5f3cd5f1c0059c0217ed1725caa117024a04e 100644
--- a/src/xercesc/internal/WFXMLScanner.cpp
+++ b/src/xercesc/internal/WFXMLScanner.cpp
@@ -188,7 +188,7 @@ void WFXMLScanner::scanDocument(const InputSource& src)
else
{
// Scan content, and tell it its not an external entity
- if (scanContent(false))
+ if (scanContent())
{
// That went ok, so scan for any miscellaneous stuff
if (!fReaderMgr.atEOF())
@@ -604,7 +604,7 @@ void WFXMLScanner::sendCharData(XMLBuffer& toSend)
// This method will kick off the scanning of the primary content of the
// document, i.e. the elements.
-bool WFXMLScanner::scanContent(const bool extEntity)
+bool WFXMLScanner::scanContent()
{
// Go into a loop until we hit the end of the root element, or we fall
// out because there is no root element.
@@ -2069,7 +2069,7 @@ void WFXMLScanner::scanCharData(XMLBuffer& toUse)
// only makes any difference if the return value indicates the value was
// returned directly.
XMLScanner::EntityExpRes
-WFXMLScanner::scanEntityRef(const bool inAttVal
+WFXMLScanner::scanEntityRef(const bool
, XMLCh& firstCh
, XMLCh& secondCh
, bool& escaped)
diff --git a/src/xercesc/internal/WFXMLScanner.hpp b/src/xercesc/internal/WFXMLScanner.hpp
index 893ba1b76d1c777780f648cf59d2672fe991975f..3cfb123b8dcaa7c3ede1a16e3f83f9b03a080a06 100644
--- a/src/xercesc/internal/WFXMLScanner.hpp
+++ b/src/xercesc/internal/WFXMLScanner.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/10/22 20:22:30 knoaman
* Prepare for annotation support.
*
@@ -189,7 +192,7 @@ private :
const XMLCh* const attrName
, XMLBuffer& toFill
);
- bool scanContent(const bool extEntity);
+ bool scanContent();
void scanEndTag(bool& gotData);
bool scanStartTag(bool& gotData);
bool scanStartTagNS(bool& gotData);
diff --git a/src/xercesc/internal/XMLGrammarPoolImpl.cpp b/src/xercesc/internal/XMLGrammarPoolImpl.cpp
index 13863b97da94d60a11de6f5b5aae2ac0b1cf36d8..755d3897d90477bce8fbdd28f1407041af4d8009 100644
--- a/src/xercesc/internal/XMLGrammarPoolImpl.cpp
+++ b/src/xercesc/internal/XMLGrammarPoolImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.18 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.17 2004/01/13 16:34:20 cargilld
* Misc memory management changes.
*
@@ -178,9 +181,9 @@ XMLGrammarPoolImpl::XMLGrammarPoolImpl(MemoryManager* const memMgr)
,fGrammarRegistry(0)
,fStringPool(0)
,fSynchronizedStringPool(0)
+,fXSModel(0)
,fLocked(false)
,fXSModelIsValid(false)
-,fXSModel(0)
{
fGrammarRegistry = new (memMgr) RefHashTableOf<Grammar>(29, true, memMgr);
fStringPool = new (memMgr) XMLStringPool(109, memMgr);
diff --git a/src/xercesc/internal/XMLInternalErrorHandler.hpp b/src/xercesc/internal/XMLInternalErrorHandler.hpp
index d52a0b42b28cc4780b2966d2fb29673ef5a9c2a3..c401074aec300b157f72e6e945f264e52b60722c 100644
--- a/src/xercesc/internal/XMLInternalErrorHandler.hpp
+++ b/src/xercesc/internal/XMLInternalErrorHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2002/11/04 14:58:18 tng
* C++ Namespace Support.
*
@@ -130,6 +133,13 @@ public:
bool fSawError;
bool fSawFatal;
ErrorHandler* fUserErrorHandler;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLInternalErrorHandler(const XMLInternalErrorHandler&);
+ XMLInternalErrorHandler& operator=(const XMLInternalErrorHandler&);
};
inline bool XMLInternalErrorHandler::getSawWarning() const
diff --git a/src/xercesc/internal/XMLReader.cpp b/src/xercesc/internal/XMLReader.cpp
index fedfb15e3eec72f4a80d5e326943c56d0eaa5dc1..653d4afa63633128fbcf64c515920a8e6a0fffbf 100644
--- a/src/xercesc/internal/XMLReader.cpp
+++ b/src/xercesc/internal/XMLReader.cpp
@@ -152,9 +152,9 @@ XMLReader::XMLReader(const XMLCh* const pubId
, fSource(source)
, fSrcOfsBase(0)
, fSrcOfsSupported(false)
- , fCalculateSrcOfs(calculateSrcOfs)
- , fStream(streamToAdopt)
+ , fCalculateSrcOfs(calculateSrcOfs)
, fSystemId(XMLString::replicate(sysId, manager))
+ , fStream(streamToAdopt)
, fSwapped(false)
, fThrowAtEnd(throwAtEnd)
, fTranscoder(0)
@@ -233,9 +233,9 @@ XMLReader::XMLReader(const XMLCh* const pubId
, fSource(source)
, fSrcOfsBase(0)
, fSrcOfsSupported(false)
- , fCalculateSrcOfs(calculateSrcOfs)
- , fStream(streamToAdopt)
+ , fCalculateSrcOfs(calculateSrcOfs)
, fSystemId(XMLString::replicate(sysId, manager))
+ , fStream(streamToAdopt)
, fSwapped(false)
, fThrowAtEnd(throwAtEnd)
, fTranscoder(0)
@@ -354,9 +354,9 @@ XMLReader::XMLReader(const XMLCh* const pubId
, fSource(source)
, fSrcOfsBase(0)
, fSrcOfsSupported(false)
- , fCalculateSrcOfs(calculateSrcOfs)
- , fStream(streamToAdopt)
+ , fCalculateSrcOfs(calculateSrcOfs)
, fSystemId(XMLString::replicate(sysId, manager))
+ , fStream(streamToAdopt)
, fSwapped(false)
, fThrowAtEnd(throwAtEnd)
, fTranscoder(0)
diff --git a/src/xercesc/internal/XMLReader.hpp b/src/xercesc/internal/XMLReader.hpp
index cdd11d7087c3d988c1fcbdf201b2b935ecb97069..6c14bc26bc510ebd7cdcfa16fdb8dbf3f53c7304 100644
--- a/src/xercesc/internal/XMLReader.hpp
+++ b/src/xercesc/internal/XMLReader.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.14 2003/05/16 21:36:58 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -361,6 +364,12 @@ public:
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLReader(const XMLReader&);
+ XMLReader& operator=(const XMLReader&);
+
// ---------------------------------------------------------------------------
// Class Constants
//
diff --git a/src/xercesc/internal/XMLScanner.cpp b/src/xercesc/internal/XMLScanner.cpp
index 9ea47919657f127b4c917cc30ff4087a706c0bf4..097c4a5121c78354f3e5b10049e820ef2fd5a4be 100644
--- a/src/xercesc/internal/XMLScanner.cpp
+++ b/src/xercesc/internal/XMLScanner.cpp
@@ -162,9 +162,9 @@ static XMLMsgLoader& gScannerMsgLoader()
// ---------------------------------------------------------------------------
XMLScanner::XMLScanner(XMLValidator* const valToAdopt,
GrammarResolver* const grammarResolver,
- MemoryManager* const manager) :
-
- fCalculateSrcOfs(false)
+ MemoryManager* const manager)
+ : fStandardUriConformant(false)
+ , fCalculateSrcOfs(false)
, fDoNamespaces(false)
, fExitOnFirstFatal(true)
, fValidationConstraintFatal(false)
@@ -180,11 +180,17 @@ XMLScanner::XMLScanner(XMLValidator* const valToAdopt,
, fLoadExternalDTD(true)
, fNormalizeData(true)
, fErrorCount(0)
+ , fEntityExpansionLimit(0)
+ , fEntityExpansionCount(0)
, fEmptyNamespaceId(0)
, fUnknownNamespaceId(0)
, fXMLNamespaceId(0)
, fXMLNSNamespaceId(0)
, fSchemaNamespaceId(0)
+ , fUIntPool(0)
+ , fUIntPoolRow(0)
+ , fUIntPoolCol(0)
+ , fUIntPoolRowTotal(2)
, fScannerId(0)
, fSequenceId(0)
, fAttrList(0)
@@ -193,6 +199,7 @@ XMLScanner::XMLScanner(XMLValidator* const valToAdopt,
, fEntityHandler(0)
, fErrorReporter(0)
, fErrorHandler(0)
+ , fPSVIHandler(0)
, fValidationContext(0)
, fEntityDeclPoolRetrieved(false)
, fReaderMgr(manager)
@@ -205,8 +212,7 @@ XMLScanner::XMLScanner(XMLValidator* const valToAdopt,
, fURIStringPool(0)
, fRootElemName(0)
, fExternalSchemaLocation(0)
- , fExternalNoNamespaceSchemaLocation(0)
- , fStandardUriConformant(false)
+ , fExternalNoNamespaceSchemaLocation(0)
, fSecurityManager(0)
, fXMLVersion(XMLReader::XMLV1_0)
, fMemoryManager(manager)
@@ -217,12 +223,7 @@ XMLScanner::XMLScanner(XMLValidator* const valToAdopt,
, fQNameBuf(1023, manager)
, fPrefixBuf(1023, manager)
, fURIBuf(1023, manager)
- , fElemStack(manager)
- , fUIntPool(0)
- , fUIntPoolRow(0)
- , fUIntPoolCol(0)
- , fUIntPoolRowTotal(2)
- , fPSVIHandler(0)
+ , fElemStack(manager)
{
commonInit();
@@ -238,9 +239,9 @@ XMLScanner::XMLScanner( XMLDocumentHandler* const docHandler
, XMLErrorReporter* const errHandler
, XMLValidator* const valToAdopt
, GrammarResolver* const grammarResolver
- , MemoryManager* const manager) :
-
- fCalculateSrcOfs(false)
+ , MemoryManager* const manager)
+ : fStandardUriConformant(false)
+ , fCalculateSrcOfs(false)
, fDoNamespaces(false)
, fExitOnFirstFatal(true)
, fValidationConstraintFatal(false)
@@ -256,11 +257,17 @@ XMLScanner::XMLScanner( XMLDocumentHandler* const docHandler
, fLoadExternalDTD(true)
, fNormalizeData(true)
, fErrorCount(0)
+ , fEntityExpansionLimit(0)
+ , fEntityExpansionCount(0)
, fEmptyNamespaceId(0)
, fUnknownNamespaceId(0)
, fXMLNamespaceId(0)
, fXMLNSNamespaceId(0)
, fSchemaNamespaceId(0)
+ , fUIntPool(0)
+ , fUIntPoolRow(0)
+ , fUIntPoolCol(0)
+ , fUIntPoolRowTotal(2)
, fScannerId(0)
, fSequenceId(0)
, fAttrList(0)
@@ -269,6 +276,7 @@ XMLScanner::XMLScanner( XMLDocumentHandler* const docHandler
, fEntityHandler(entityHandler)
, fErrorReporter(errHandler)
, fErrorHandler(0)
+ , fPSVIHandler(0)
, fValidationContext(0)
, fEntityDeclPoolRetrieved(false)
, fReaderMgr(manager)
@@ -281,8 +289,7 @@ XMLScanner::XMLScanner( XMLDocumentHandler* const docHandler
, fURIStringPool(0)
, fRootElemName(0)
, fExternalSchemaLocation(0)
- , fExternalNoNamespaceSchemaLocation(0)
- , fStandardUriConformant(false)
+ , fExternalNoNamespaceSchemaLocation(0)
, fSecurityManager(0)
, fXMLVersion(XMLReader::XMLV1_0)
, fMemoryManager(manager)
@@ -294,11 +301,6 @@ XMLScanner::XMLScanner( XMLDocumentHandler* const docHandler
, fPrefixBuf(1023, manager)
, fURIBuf(1023, manager)
, fElemStack(manager)
- , fUIntPool(0)
- , fUIntPoolRow(0)
- , fUIntPoolCol(0)
- , fUIntPoolRowTotal(2)
- , fPSVIHandler(0)
{
commonInit();
diff --git a/src/xercesc/internal/XObjectComparator.cpp b/src/xercesc/internal/XObjectComparator.cpp
index 9a0ea3a7096114d5088c21a364fa4f2e1fe292ff..9b5dd3e1c44afd9f8a4b5d842957b67440cc98ec 100644
--- a/src/xercesc/internal/XObjectComparator.cpp
+++ b/src/xercesc/internal/XObjectComparator.cpp
@@ -57,6 +57,9 @@
/*
*
* $Log$
+ * Revision 1.6 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/12/17 00:18:34 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -167,8 +170,8 @@ bool XObjectComparator::isEquivalent(Grammar* const lValue
}
-bool XObjectComparator::isBaseEquivalent(Grammar* const lValue
- , Grammar* const rValue)
+bool XObjectComparator::isBaseEquivalent(Grammar* const
+ , Grammar* const)
{
return true;
}
@@ -916,18 +919,14 @@ bool XObjectComparator::isEquivalent(IdentityConstraint* const lValue
switch(lValue->getType())
{
case IdentityConstraint::UNIQUE:
- return isEquivalent((IC_Unique*)lValue, (IC_Unique*)rValue);
- break;
+ return isEquivalent((IC_Unique*)lValue, (IC_Unique*)rValue);
case IdentityConstraint::KEY:
- return isEquivalent((IC_Key*)lValue, (IC_Key*)rValue);
- break;
+ return isEquivalent((IC_Key*)lValue, (IC_Key*)rValue);
case IdentityConstraint::KEYREF:
- return isEquivalent((IC_KeyRef*)lValue, (IC_KeyRef*)rValue);
- break;
+ return isEquivalent((IC_KeyRef*)lValue, (IC_KeyRef*)rValue);
default:
//throw exception here
- return false;
- break;
+ return false;
}
}
diff --git a/src/xercesc/internal/XProtoType.hpp b/src/xercesc/internal/XProtoType.hpp
index 3d5ef60ed267b5d221bff02dafe764eb418afdc1..17accd087f2cc803b6f3f6c550139a4b3f5a649f 100644
--- a/src/xercesc/internal/XProtoType.hpp
+++ b/src/xercesc/internal/XProtoType.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/12/17 00:18:34 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -126,7 +129,7 @@ XSerializable* class_name::createObject(MemoryManager* manager) \
***/
#define IMPL_XPROTOTYPE_NOCREATE(class_name) \
IMPL_XPROTOTYPE_INSTANCE(class_name) \
-XSerializable* class_name::createObject(MemoryManager* manager) \
+XSerializable* class_name::createObject(MemoryManager*) \
{return 0;}
diff --git a/src/xercesc/internal/XSerializeEngine.cpp b/src/xercesc/internal/XSerializeEngine.cpp
index 9ff6718e530add49b267c8a0f4dd292f8db0e416..be0385906f007fd8470631653bbb6f7307e2c369 100644
--- a/src/xercesc/internal/XSerializeEngine.cpp
+++ b/src/xercesc/internal/XSerializeEngine.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.14 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.13 2004/01/15 23:42:32 peiyongz
* proper allignment for built-in datatype read/write
*
@@ -159,8 +162,8 @@ XSerializeEngine::XSerializeEngine(BinInputStream* inStream
,fOutputStream(0)
,fBufSize(bufSize)
,fBufStart( (XMLByte*) fMemoryManager->allocate(bufSize))
-,fBufCur(fBufStart)
,fBufEnd(0)
+,fBufCur(fBufStart)
,fBufLoadMax(fBufStart)
,fStorePool(0)
,fLoadPool( new (fMemoryManager) ValueVectorOf<void*>(29, fMemoryManager, false))
@@ -182,8 +185,8 @@ XSerializeEngine::XSerializeEngine(BinOutputStream* outStream
,fOutputStream(outStream)
,fBufSize(bufSize)
,fBufStart((XMLByte*) fMemoryManager->allocate(bufSize))
-,fBufCur(fBufStart)
,fBufEnd(fBufStart+bufSize)
+,fBufCur(fBufStart)
,fBufLoadMax(0)
,fStorePool( new (fMemoryManager) RefHashTableOf<XSerializedObjectId>(29, true, new HashPtr(), fMemoryManager) )
,fLoadPool(0)
diff --git a/src/xercesc/internal/XSerializeEngine.hpp b/src/xercesc/internal/XSerializeEngine.hpp
index cdec255c6f32c30cba4550da856d2e23790a6d68..ef68f69002911caaadcba1858a2699483f2d3403 100644
--- a/src/xercesc/internal/XSerializeEngine.hpp
+++ b/src/xercesc/internal/XSerializeEngine.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2004/01/29 11:46:30 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2004/01/16 21:55:18 peiyongz
* maintain the same size on both 32/64 bit architecture
*
@@ -723,7 +726,8 @@ public:
private:
- inline XSerializedObjectId(XSerializeEngine::XSerializedObjectId_t val) { fData = val; };
+ inline XSerializedObjectId(XSerializeEngine::XSerializedObjectId_t val):
+ fData(val) { };
inline XSerializeEngine::XSerializedObjectId_t getValue() const {return fData; };
diff --git a/src/xercesc/parsers/AbstractDOMParser.cpp b/src/xercesc/parsers/AbstractDOMParser.cpp
index a049aa9fb97d4077cd2cb3986aa9a68f011b5448..194184a4d6264589deacda7c32b480ec334336c4 100644
--- a/src/xercesc/parsers/AbstractDOMParser.cpp
+++ b/src/xercesc/parsers/AbstractDOMParser.cpp
@@ -217,7 +217,7 @@ void AbstractDOMParser::reset()
fDocumentAdoptedByUser = false;
fNodeStack->removeAllElements();
fInternalSubset.reset();
-};
+}
void AbstractDOMParser::resetPool()
@@ -580,7 +580,7 @@ void AbstractDOMParser::parseReset(XMLPScanToken& token)
// ---------------------------------------------------------------------------
void AbstractDOMParser::docCharacters( const XMLCh* const chars
, const unsigned int length
- , const bool cdataSection)
+ , const bool cdataSection)
{
// Ignore chars outside of content
if (!fWithinElement)
@@ -642,7 +642,7 @@ void AbstractDOMParser::docPI( const XMLCh* const target
}
-void AbstractDOMParser::endEntityReference(const XMLEntityDecl& entDecl)
+void AbstractDOMParser::endEntityReference(const XMLEntityDecl&)
{
DOMEntityReferenceImpl *erImpl = 0;
DOMNode* firstChild = 0;
@@ -723,10 +723,10 @@ void AbstractDOMParser::endEntityReference(const XMLEntityDecl& entDecl)
}
-void AbstractDOMParser::endElement( const XMLElementDecl& elemDecl
- , const unsigned int urlId
- , const bool isRoot
- , const XMLCh* const elemPrefix)
+void AbstractDOMParser::endElement( const XMLElementDecl&
+ , const unsigned int
+ , const bool
+ , const XMLCh* const)
{
fCurrentNode = fCurrentParent;
fCurrentParent = fNodeStack->pop();
@@ -750,7 +750,7 @@ void AbstractDOMParser::elementTypeInfo( const XMLCh * const typeName
void AbstractDOMParser::ignorableWhitespace(const XMLCh* const chars
, const unsigned int length
- , const bool cdataSection)
+ , const bool)
{
// Ignore chars before the root element
if (!fWithinElement || !fIncludeIgnorableWhitespace)
@@ -828,10 +828,6 @@ void AbstractDOMParser::startElement(const XMLElementDecl& elemDecl
DOMElement *elem;
DOMElementImpl *elemImpl;
- static const XMLCh XSI[] = {
- chLatin_x, chLatin_s, chLatin_i, chNull
- };
-
//get the list for use in the loop
XMLAttDefList* defAttrs = 0;
if(elemDecl.hasAttDefs()) {
@@ -868,11 +864,9 @@ void AbstractDOMParser::startElement(const XMLElementDecl& elemDecl
for (unsigned int index = 0; index < attrCount; ++index) {
const XMLAttr* oneAttrib = attrList.elementAt(index);
unsigned int attrURIId = oneAttrib -> getURIId();
- namespaceURI = 0;
- bool foundXMLNS = false;
+ namespaceURI = 0;
if (XMLString::equals(oneAttrib -> getName(), XMLUni::fgXMLNSString)) { //for xmlns=...
- attrURIId = fScanner->getXMLNSNamespaceId();
- foundXMLNS = true;
+ attrURIId = fScanner->getXMLNSNamespaceId();
}
if (attrURIId != fScanner->getEmptyNamespaceId()) { //TagName has a prefix
namespaceURI = fScanner->getURIText(attrURIId); //get namespaceURI
@@ -1109,7 +1103,7 @@ void AbstractDOMParser::attDef
(
const DTDElementDecl& elemDecl
, const DTDAttDef& attDef
- , const bool ignoring
+ , const bool
)
{
if (fDocumentType->isIntSubsetReading())
@@ -1231,8 +1225,8 @@ void AbstractDOMParser::doctypeDecl
const DTDElementDecl& elemDecl
, const XMLCh* const publicId
, const XMLCh* const systemId
- , const bool hasIntSubset
- , const bool hasExtSubset
+ , const bool
+ , const bool
)
{
fDocumentType = (DOMDocumentTypeImpl *) fDocument->createDocumentType(elemDecl.getFullName(), publicId, systemId);
@@ -1263,7 +1257,7 @@ void AbstractDOMParser::doctypePI
void AbstractDOMParser::doctypeWhitespace
(
const XMLCh* const chars
- , const unsigned int length
+ , const unsigned int
)
{
if (fDocumentType->isIntSubsetReading())
@@ -1273,7 +1267,7 @@ void AbstractDOMParser::doctypeWhitespace
void AbstractDOMParser::elementDecl
(
const DTDElementDecl& decl
- , const bool isIgnored
+ , const bool
)
{
if (fDocumentType->isIntSubsetReading())
@@ -1411,8 +1405,8 @@ void AbstractDOMParser::endExtSubset()
void AbstractDOMParser::entityDecl
(
const DTDEntityDecl& entityDecl
- , const bool isPEDecl
- , const bool isIgnored
+ , const bool
+ , const bool
)
{
DOMEntityImpl* entity = (DOMEntityImpl *) fDocument->createEntity(entityDecl.getName());
@@ -1485,7 +1479,7 @@ void AbstractDOMParser::resetDocType()
void AbstractDOMParser::notationDecl
(
const XMLNotationDecl& notDecl
- , const bool isIgnored
+ , const bool
)
{
DOMNotationImpl* notation = (DOMNotationImpl *)fDocument->createNotation(notDecl.getName());
diff --git a/src/xercesc/parsers/AbstractDOMParser.hpp b/src/xercesc/parsers/AbstractDOMParser.hpp
index 59d08615cc839550ca99272ba5797cc2b61745ea..709db1364cdd077b1a43e48af30d87a5c3fef3f0 100644
--- a/src/xercesc/parsers/AbstractDOMParser.hpp
+++ b/src/xercesc/parsers/AbstractDOMParser.hpp
@@ -1478,6 +1478,12 @@ private :
void initialize();
void cleanUp();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ AbstractDOMParser(const AbstractDOMParser&);
+ AbstractDOMParser& operator=(const AbstractDOMParser&);
+
protected:
// -----------------------------------------------------------------------
// Protected data members
diff --git a/src/xercesc/parsers/DOMBuilderImpl.cpp b/src/xercesc/parsers/DOMBuilderImpl.cpp
index c67bf7ba3fa8c3a64741fd441a827dce45261348..85b62b6d683ca013d99bcc71549e501271ea1a35 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.cpp
+++ b/src/xercesc/parsers/DOMBuilderImpl.cpp
@@ -99,9 +99,9 @@ DOMBuilderImpl::DOMBuilderImpl( XMLValidator* const valToAdopt
AbstractDOMParser(valToAdopt, manager, gramPool)
, fAutoValidation(false)
, fValidation(false)
-, fErrorHandler(0)
, fEntityResolver(0)
, fXMLEntityResolver(0)
+, fErrorHandler(0)
, fFilter(0)
, fCharsetOverridesXMLEncoding(true)
, fUserAdoptsDocument(false)
@@ -154,7 +154,7 @@ void DOMBuilderImpl::setXMLEntityResolver(XMLEntityResolver* const handler)
}
}
-void DOMBuilderImpl::setFilter(DOMBuilderFilter* const filter)
+void DOMBuilderImpl::setFilter(DOMBuilderFilter* const)
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
}
@@ -485,9 +485,9 @@ DOMDocument* DOMBuilderImpl::parseURI(const char* const systemId)
return getDocument();
}
-void DOMBuilderImpl::parseWithContext(const DOMInputSource& source,
- DOMNode* const contextNode,
- const short action)
+void DOMBuilderImpl::parseWithContext(const DOMInputSource&,
+ DOMNode* const,
+ const short)
{
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0);
}
@@ -497,11 +497,11 @@ void DOMBuilderImpl::parseWithContext(const DOMInputSource& source,
// DOMBuilderImpl: Implementation of the XMLErrorReporter interface
// ---------------------------------------------------------------------------
void DOMBuilderImpl::error( const unsigned int code
- , const XMLCh* const msgDomain
+ , const XMLCh* const
, const XMLErrorReporter::ErrTypes errType
, const XMLCh* const errorText
, const XMLCh* const systemId
- , const XMLCh* const publicId
+ , const XMLCh* const
, const XMLSSize_t lineNum
, const XMLSSize_t colNum)
{
diff --git a/src/xercesc/parsers/DOMBuilderImpl.hpp b/src/xercesc/parsers/DOMBuilderImpl.hpp
index e5fce5736e552da854dd0cb9a17f2131b44eb39d..957ea03cbd86328ad32bdbb1c97ccaa171594c7a 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.hpp
+++ b/src/xercesc/parsers/DOMBuilderImpl.hpp
@@ -903,6 +903,12 @@ private :
DOMBuilderFilter* fFilter;
bool fCharsetOverridesXMLEncoding;
bool fUserAdoptsDocument;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DOMBuilderImpl(const DOMBuilderImpl &);
+ DOMBuilderImpl & operator = (const DOMBuilderImpl &);
};
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
index 1065c1c613929e2135b73368be7345eed65985a8..7494ff8b5149836a824ae0281e363c8a8ae0c3c3 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.33 2004/01/29 11:46:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.32 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -1251,8 +1254,8 @@ void SAX2XMLReaderImpl::doctypePI( const XMLCh* const
}
-void SAX2XMLReaderImpl::doctypeWhitespace( const XMLCh* const chars
- , const unsigned int length)
+void SAX2XMLReaderImpl::doctypeWhitespace( const XMLCh* const
+ , const unsigned int)
{
// Unused by SAX DTDHandler interface at this time
}
@@ -1429,7 +1432,7 @@ void SAX2XMLReaderImpl::resetEntities()
InputSource* SAX2XMLReaderImpl::resolveEntity( const XMLCh* const publicId
, const XMLCh* const systemId
- , const XMLCh* const baseURI)
+ , const XMLCh* const)
{
// Just map to the SAX entity resolver handler
if (fEntityResolver)
@@ -1467,8 +1470,8 @@ void SAX2XMLReaderImpl::resetErrors()
}
-void SAX2XMLReaderImpl::error( const unsigned int code
- , const XMLCh* const msgDomain
+void SAX2XMLReaderImpl::error( const unsigned int
+ , const XMLCh* const
, const XMLErrorReporter::ErrTypes errType
, const XMLCh* const errorText
, const XMLCh* const systemId
diff --git a/src/xercesc/parsers/SAXParser.cpp b/src/xercesc/parsers/SAXParser.cpp
index 4940e2083fa9c61d0ca34e2bf3a3251754471e59..24c62355da90c841415247596dbc030c20f74b8d 100644
--- a/src/xercesc/parsers/SAXParser.cpp
+++ b/src/xercesc/parsers/SAXParser.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.31 2004/01/29 11:46:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.30 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -1181,9 +1184,9 @@ void SAXParser::startEntityReference(const XMLEntityDecl& entityDecl)
// ---------------------------------------------------------------------------
// SAXParser: Overrides of the DocTypeHandler interface
// ---------------------------------------------------------------------------
-void SAXParser::attDef( const DTDElementDecl& elemDecl
- , const DTDAttDef& attDef
- , const bool ignoring)
+void SAXParser::attDef( const DTDElementDecl&
+ , const DTDAttDef&
+ , const bool)
{
// Unused by SAX DTDHandler interface at this time
}
@@ -1195,11 +1198,11 @@ void SAXParser::doctypeComment(const XMLCh* const)
}
-void SAXParser::doctypeDecl(const DTDElementDecl& elemDecl
- , const XMLCh* const publicId
- , const XMLCh* const systemId
- , const bool hasIntSubset
- , const bool hasExtSubset)
+void SAXParser::doctypeDecl(const DTDElementDecl&
+ , const XMLCh* const
+ , const XMLCh* const
+ , const bool
+ , const bool)
{
// Unused by SAX DTDHandler interface at this time
}
@@ -1212,8 +1215,8 @@ void SAXParser::doctypePI( const XMLCh* const
}
-void SAXParser::doctypeWhitespace( const XMLCh* const chars
- , const unsigned int length)
+void SAXParser::doctypeWhitespace( const XMLCh* const
+ , const unsigned int)
{
// Unused by SAX DTDHandler interface at this time
}
@@ -1244,7 +1247,7 @@ void SAXParser::endExtSubset()
void SAXParser::entityDecl( const DTDEntityDecl& entityDecl
- , const bool isPEDecl
+ , const bool
, const bool isIgnored)
{
//
@@ -1325,8 +1328,8 @@ void SAXParser::resetErrors()
}
-void SAXParser::error( const unsigned int code
- , const XMLCh* const msgDomain
+void SAXParser::error( const unsigned int
+ , const XMLCh* const
, const XMLErrorReporter::ErrTypes errType
, const XMLCh* const errorText
, const XMLCh* const systemId
@@ -1384,7 +1387,7 @@ void SAXParser::resetEntities()
InputSource*
SAXParser::resolveEntity( const XMLCh* const publicId
, const XMLCh* const systemId
- , const XMLCh* const baseURI)
+ , const XMLCh* const)
{
// Just map to the SAX entity resolver handler
if (fEntityResolver)
diff --git a/src/xercesc/parsers/XercesDOMParser.cpp b/src/xercesc/parsers/XercesDOMParser.cpp
index bc1a135538c7fdcbf714f5abee077918927beab1..9f94dab0b822d1f0df7f1b71d22b59549b10a6e2 100644
--- a/src/xercesc/parsers/XercesDOMParser.cpp
+++ b/src/xercesc/parsers/XercesDOMParser.cpp
@@ -93,9 +93,9 @@ XercesDOMParser::XercesDOMParser( XMLValidator* const valToAdopt
, XMLGrammarPool* const gramPool):
AbstractDOMParser(valToAdopt, manager, gramPool)
-, fErrorHandler(0)
, fEntityResolver(0)
, fXMLEntityResolver(0)
+, fErrorHandler(0)
{
}
@@ -206,8 +206,8 @@ void XercesDOMParser::resetDocumentPool()
// ---------------------------------------------------------------------------
// XercesDOMParser: Implementation of the XMLErrorReporter interface
// ---------------------------------------------------------------------------
-void XercesDOMParser::error( const unsigned int code
- , const XMLCh* const msgDomain
+void XercesDOMParser::error( const unsigned int
+ , const XMLCh* const
, const XMLErrorReporter::ErrTypes errType
, const XMLCh* const errorText
, const XMLCh* const systemId
@@ -255,7 +255,7 @@ void XercesDOMParser::resetErrors()
InputSource*
XercesDOMParser::resolveEntity(const XMLCh* const publicId,
const XMLCh* const systemId,
- const XMLCh* const baseURI)
+ const XMLCh* const)
{
//
// Just map it to the SAX entity resolver. If there is not one installed,
diff --git a/src/xercesc/parsers/XercesDOMParser.hpp b/src/xercesc/parsers/XercesDOMParser.hpp
index b9a5a53fca0ff60c5d87d338c844185389e06968..74627faf154290f21caa31b9d52eb1e1bed59cc4 100644
--- a/src/xercesc/parsers/XercesDOMParser.hpp
+++ b/src/xercesc/parsers/XercesDOMParser.hpp
@@ -653,6 +653,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XercesDOMParser(const XercesDOMParser&);
+ XercesDOMParser& operator=(const XercesDOMParser&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/sax/HandlerBase.hpp b/src/xercesc/sax/HandlerBase.hpp
index dd053931f825c2f6d8afc7fd234ff6d03e00ce32..20fd73a0a36a26be1fc8c5cd37af154890f0c523 100644
--- a/src/xercesc/sax/HandlerBase.hpp
+++ b/src/xercesc/sax/HandlerBase.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:46:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/01 23:23:26 neilg
* fix for bug 25118; thanks to Jeroen Witmond
*
@@ -444,6 +447,16 @@ public:
, const XMLCh* const notationName
);
//@}
+
+ HandlerBase() {};
+ virtual ~HandlerBase() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HandlerBase(const HandlerBase&);
+ HandlerBase& operator=(const HandlerBase&);
};
diff --git a/src/xercesc/sax2/DefaultHandler.hpp b/src/xercesc/sax2/DefaultHandler.hpp
index 4cf007d0239bfc4c8b6c94bdd19504ea3250cb3c..dd1f223c1843368b64c8947abd1084151a46de89 100644
--- a/src/xercesc/sax2/DefaultHandler.hpp
+++ b/src/xercesc/sax2/DefaultHandler.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:46:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/02 14:33:13 amassari
* Don't use the word "exception" as a variable name, as VC 7.1 complains about it
*
@@ -710,6 +713,16 @@ public:
);
//@}
+
+ DefaultHandler() {};
+ virtual ~DefaultHandler() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DefaultHandler(const DefaultHandler&);
+ DefaultHandler& operator=(const DefaultHandler&);
};
diff --git a/src/xercesc/sax2/XMLReaderFactory.hpp b/src/xercesc/sax2/XMLReaderFactory.hpp
index 91f6530dc4e4e30050fb8df1e7ed5a89312f63a2..38f3df6216a81cfc0a561114205258ecab9d1833 100644
--- a/src/xercesc/sax2/XMLReaderFactory.hpp
+++ b/src/xercesc/sax2/XMLReaderFactory.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:46:32 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/06/20 18:56:45 peiyongz
* Stateless Grammar Pool :: Part I
*
@@ -117,6 +120,13 @@ public:
, XMLGrammarPool* const gramPool = 0
) ;
static SAX2XMLReader * createXMLReader(const XMLCh* className) ;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLReaderFactory(const XMLReaderFactory&);
+ XMLReaderFactory& operator=(const XMLReaderFactory&);
};
@@ -126,7 +136,7 @@ inline SAX2XMLReader * XMLReaderFactory::createXMLReader(MemoryManager* const m
return (SAX2XMLReader*)(new (manager) SAX2XMLReaderImpl(manager, gramPool));
}
-inline SAX2XMLReader * XMLReaderFactory::createXMLReader(const XMLCh * className)
+inline SAX2XMLReader * XMLReaderFactory::createXMLReader(const XMLCh *)
{
throw SAXNotSupportedException();
// unimplemented
diff --git a/src/xercesc/util/BaseRefVectorOf.c b/src/xercesc/util/BaseRefVectorOf.c
index d438469a8aa7fd3f74387eaf8a11ba530de747b3..1735acbf7b6f9321eafa308d04dfd8b4cd4338eb 100644
--- a/src/xercesc/util/BaseRefVectorOf.c
+++ b/src/xercesc/util/BaseRefVectorOf.c
@@ -350,7 +350,13 @@ template <class TElem> BaseRefVectorEnumerator<TElem>::~BaseRefVectorEnumerator(
delete fToEnum;
}
-
+template <class TElem> BaseRefVectorEnumerator<TElem>::
+BaseRefVectorEnumerator(const BaseRefVectorEnumerator<TElem>& toCopy) :
+ fAdopted(toCopy.fAdopted)
+ , fCurIndex(toCopy.fCurIndex)
+ , fToEnum(toCopy.fToEnum)
+{
+}
// ---------------------------------------------------------------------------
// RefBaseRefVectorEnumerator: Enum interface
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/BaseRefVectorOf.hpp b/src/xercesc/util/BaseRefVectorOf.hpp
index 96da51777ba301e5994d84ea042f7365075d5f11..b99769bbd4c480df1cb107415dc0914fc07502ef 100644
--- a/src/xercesc/util/BaseRefVectorOf.hpp
+++ b/src/xercesc/util/BaseRefVectorOf.hpp
@@ -115,6 +115,12 @@ public :
// -----------------------------------------------------------------------
void ensureExtraCapacity(const unsigned int length);
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BaseRefVectorOf(const BaseRefVectorOf<TElem>& copy);
+ BaseRefVectorOf& operator=(const BaseRefVectorOf<TElem>& copy);
protected:
// -----------------------------------------------------------------------
@@ -132,7 +138,7 @@ protected:
// An enumerator for a vector. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class BaseRefVectorEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class BaseRefVectorEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -145,7 +151,7 @@ public :
);
virtual ~BaseRefVectorEnumerator();
-
+ BaseRefVectorEnumerator(const BaseRefVectorEnumerator<TElem>& copy);
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
@@ -155,6 +161,10 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BaseRefVectorEnumerator& operator=(const BaseRefVectorEnumerator<TElem>& copy);
// -----------------------------------------------------------------------
// Data Members
//
diff --git a/src/xercesc/util/BinFileInputStream.hpp b/src/xercesc/util/BinFileInputStream.hpp
index 0e5a61aa1e4d05628fe7629271eb734bd77b5987..60c3110f94d4e12ab0c50051e8a36c8c89ad9844 100644
--- a/src/xercesc/util/BinFileInputStream.hpp
+++ b/src/xercesc/util/BinFileInputStream.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/12/17 13:58:02 cargilld
* Platform update for memory management so that the static memory manager (one
* used to call Initialize) is only for static data.
@@ -142,6 +145,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinFileInputStream(const BinFileInputStream&);
+ BinFileInputStream& operator=(const BinFileInputStream&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/BinMemInputStream.hpp b/src/xercesc/util/BinMemInputStream.hpp
index b69cc7b85674206600e17d5d00edde077e0587f8..df455cfc922affdd6af2cd4a0a318117ad15da84 100644
--- a/src/xercesc/util/BinMemInputStream.hpp
+++ b/src/xercesc/util/BinMemInputStream.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/16 03:11:22 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -132,6 +135,11 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinMemInputStream(const BinMemInputStream&);
+ BinMemInputStream& operator=(const BinMemInputStream&);
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/BitSet.hpp b/src/xercesc/util/BitSet.hpp
index b25098197a8bc526b0198de900e34f7f73445e51..3ee980142eadc280c74b98d89273420811cd8c6f 100644
--- a/src/xercesc/util/BitSet.hpp
+++ b/src/xercesc/util/BitSet.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/15 19:04:35 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -145,9 +148,8 @@ private :
// -----------------------------------------------------------------------
// Unimplemented constructors
// -----------------------------------------------------------------------
- BitSet();
-
-
+ BitSet();
+ BitSet& operator=(const BitSet&);
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/FlagJanitor.c b/src/xercesc/util/FlagJanitor.c
index 7c4391a3c02f64e50001440ac2f9efe39195618b..33c310b7f9f3306647714371102663ee2080e17b 100644
--- a/src/xercesc/util/FlagJanitor.c
+++ b/src/xercesc/util/FlagJanitor.c
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2002/11/04 15:22:03 tng
* C++ Namespace Support.
*
@@ -92,9 +95,9 @@ XERCES_CPP_NAMESPACE_BEGIN
// Constructors and Destructor
// ---------------------------------------------------------------------------
template <class T> FlagJanitor<T>::FlagJanitor(T* const valPtr, const T newVal)
+: fValPtr(valPtr)
{
- // Store the pointer, save the org value, and store the new value
- fValPtr = valPtr;
+ // Store the pointer, save the org value, and store the new value
if (fValPtr)
{
fOldVal = *fValPtr;
diff --git a/src/xercesc/util/HashBase.hpp b/src/xercesc/util/HashBase.hpp
index 8a6970f280d85fbe353607e7f8457af93e0ad5b0..7fc20599e1165fa1c397d32e0492169970d88449 100644
--- a/src/xercesc/util/HashBase.hpp
+++ b/src/xercesc/util/HashBase.hpp
@@ -69,7 +69,7 @@ XERCES_CPP_NAMESPACE_BEGIN
* designed to produce hash values for XMLCh* strings. Any hasher inheriting
* from <code>HashBase</code> may be specified when the RefHashTableOf hashtable is constructed.
*/
- class XMLUTIL_EXPORT HashBase : public XMemory
+class XMLUTIL_EXPORT HashBase : public XMemory
{
public:
@@ -93,6 +93,16 @@ public:
*/
virtual bool equals(const void *const key1, const void *const key2) = 0;
+ virtual ~HashBase() {};
+
+ HashBase() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashBase(const HashBase&);
+ HashBase& operator=(const HashBase&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/HashCMStateSet.hpp b/src/xercesc/util/HashCMStateSet.hpp
index 1e36f1489ed5107f31f2fe4d4045d76429631bff..2c388ce3a75c29ad483a945fef80d503a05e7fd1 100644
--- a/src/xercesc/util/HashCMStateSet.hpp
+++ b/src/xercesc/util/HashCMStateSet.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -98,7 +101,12 @@ public:
virtual unsigned int getHashVal(const void *const key, unsigned int mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashCMStateSet(const HashCMStateSet&);
+ HashCMStateSet& operator=(const HashCMStateSet&);
};
inline HashCMStateSet::HashCMStateSet()
@@ -110,7 +118,7 @@ inline HashCMStateSet::~HashCMStateSet()
}
inline unsigned int HashCMStateSet::getHashVal(const void *const key, unsigned int mod
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
const CMStateSet* const pkey = (const CMStateSet* const) key;
return ((pkey->hashCode()) % mod);
diff --git a/src/xercesc/util/HashPtr.hpp b/src/xercesc/util/HashPtr.hpp
index 8f46c31f18439fa6b39c2288663bba96255f67ae..6c3c3fc8544f26f2e0e81e2f369a40c1483dbb04 100644
--- a/src/xercesc/util/HashPtr.hpp
+++ b/src/xercesc/util/HashPtr.hpp
@@ -77,7 +77,12 @@ public:
virtual unsigned int getHashVal(const void *const key, unsigned int mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashPtr(const HashPtr&);
+ HashPtr& operator=(const HashPtr&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/HashXMLCh.hpp b/src/xercesc/util/HashXMLCh.hpp
index 0381660e5507a1cde85a10b25fb46ee18780d0fd..a7bfbcc3659687be876f9e9d9dab16282ef17eaf 100644
--- a/src/xercesc/util/HashXMLCh.hpp
+++ b/src/xercesc/util/HashXMLCh.hpp
@@ -77,7 +77,12 @@ public:
virtual unsigned int getHashVal(const void *const key, unsigned int mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HashXMLCh(const HashXMLCh&);
+ HashXMLCh& operator=(const HashXMLCh&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/HexBin.hpp b/src/xercesc/util/HexBin.hpp
index 4d1db90cab599b6f27c7dd55653432ec55a4178c..bfa0b16c690444595c4c60bf60512a4e26117510 100644
--- a/src/xercesc/util/HexBin.hpp
+++ b/src/xercesc/util/HexBin.hpp
@@ -109,6 +109,7 @@ private :
// -----------------------------------------------------------------------
HexBin();
HexBin(const HexBin&);
+ HexBin& operator=(const HexBin&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/util/Janitor.hpp b/src/xercesc/util/Janitor.hpp
index 2dc6f9a86c047a19ff28567d0a4ea1952b569b9d..badd2411c210a4f86f32a4786586fafaa0f67705 100644
--- a/src/xercesc/util/Janitor.hpp
+++ b/src/xercesc/util/Janitor.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/11/06 19:28:11 knoaman
* PSVI support for annotations.
*
@@ -134,6 +137,7 @@ private :
// -----------------------------------------------------------------------
Janitor();
Janitor(const Janitor<T>&);
+ Janitor<T>& operator=(const Janitor<T>&);
// -----------------------------------------------------------------------
// Private data members
@@ -176,6 +180,7 @@ private :
// -----------------------------------------------------------------------
ArrayJanitor();
ArrayJanitor(const ArrayJanitor<T>& copy);
+ ArrayJanitor& operator=(const ArrayJanitor<T>& copy);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/util/KVStringPair.hpp b/src/xercesc/util/KVStringPair.hpp
index 04327c21ab4e712af8d73a3158fb60d4ac238907..5d8bdf378a9c0a92fd0b7f402772459dc7045196 100644
--- a/src/xercesc/util/KVStringPair.hpp
+++ b/src/xercesc/util/KVStringPair.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/09/25 22:23:25 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -186,6 +189,9 @@ public:
DECL_XSERIALIZABLE(KVStringPair)
private :
+ // unimplemented:
+
+ KVStringPair& operator=(const KVStringPair&);
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/KeyRefPair.c b/src/xercesc/util/KeyRefPair.c
index d646d959fb552871d30b9e1179471ad6101cd2d2..63ee83733a71ca412cf862cec239ac3474f33ec3 100644
--- a/src/xercesc/util/KeyRefPair.c
+++ b/src/xercesc/util/KeyRefPair.c
@@ -91,6 +91,15 @@ KeyRefPair(const KeyRefPair<TKey,TValue>* toCopy) :
{
}
+template <class TKey, class TValue> KeyRefPair<TKey,TValue>::
+KeyRefPair(const KeyRefPair<TKey,TValue>& toCopy) :
+
+ fKey(toCopy.fKey)
+ , fValue(toCopy.fValue)
+{
+}
+
+
template <class TKey, class TValue> KeyRefPair<TKey,TValue>::~KeyRefPair()
{
}
diff --git a/src/xercesc/util/KeyRefPair.hpp b/src/xercesc/util/KeyRefPair.hpp
index ef2cbfadeff5da20a6d61715545dbf660dd85984..ba02af4f446858860a8c8045479c173237f1433a 100644
--- a/src/xercesc/util/KeyRefPair.hpp
+++ b/src/xercesc/util/KeyRefPair.hpp
@@ -75,6 +75,7 @@ template <class TKey, class TValue> class KeyRefPair : public XMemory
KeyRefPair();
KeyRefPair(TKey* key, TValue* value);
KeyRefPair(const KeyRefPair<TKey,TValue>* toCopy);
+ KeyRefPair(const KeyRefPair<TKey,TValue>& toCopy);
~KeyRefPair();
@@ -95,6 +96,8 @@ template <class TKey, class TValue> class KeyRefPair : public XMemory
private :
+ // unimplemented:
+ KeyRefPair<TKey,TValue>& operator=(const KeyRefPair<TKey,TValue>&);
// -------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/KeyValuePair.hpp b/src/xercesc/util/KeyValuePair.hpp
index 6b15db30076f1d3182dd98a68c321976946fcd83..85fcd2838b8f09c065d80d02f2bef3ae93c08197 100644
--- a/src/xercesc/util/KeyValuePair.hpp
+++ b/src/xercesc/util/KeyValuePair.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/15 19:04:35 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -121,6 +124,9 @@ template <class TKey, class TValue> class KeyValuePair : public XMemory
private :
+ // unimplemented:
+ KeyValuePair<TKey,TValue>& operator=(const KeyValuePair<TKey,TValue>&);
+
// -------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/NameIdPool.hpp b/src/xercesc/util/NameIdPool.hpp
index ce6fa217a699192eaa5a00d7be95d6c6b97148cf..1e3d6f667b021d1aef7874ad04e8801e7c86e1f5 100644
--- a/src/xercesc/util/NameIdPool.hpp
+++ b/src/xercesc/util/NameIdPool.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -160,6 +163,12 @@ public :
TElem* fData;
NameIdPoolBucketElem<TElem>* fNext;
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ NameIdPoolBucketElem(const NameIdPoolBucketElem<TElem>&);
+ NameIdPoolBucketElem<TElem>& operator=(const NameIdPoolBucketElem<TElem>&);
};
@@ -272,7 +281,7 @@ private :
// An enumerator for a name id pool. It derives from the basic enumerator
// class, so that pools can be generically enumerated.
//
-template <class TElem> class NameIdPoolEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class NameIdPoolEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp b/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
index 1cd9e77e78c6efb3f4da43df20e55dde8ddc5e82..2c98529ae0d9b4febd36512baed7d26e4ab72a19 100644
--- a/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
+++ b/src/xercesc/util/NetAccessors/Socket/SocketNetAccessor.cpp
@@ -97,8 +97,7 @@ BinInputStream* SocketNetAccessor::makeNew(const XMLURL& urlSource)
{
UnixHTTPURLInputStream* retStrm =
new (urlSource.getMemoryManager()) UnixHTTPURLInputStream(urlSource);
- return retStrm;
- break;
+ return retStrm;
}
//
diff --git a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
index 7fc68c5d93b09220cdceb51aa209f54915c6ebe3..2defbaf19be0758414767041e6711df1e409a16d 100644
--- a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
+++ b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2004/01/29 11:51:20 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.14 2004/01/13 16:34:21 cargilld
* Misc memory management changes.
*
@@ -162,6 +165,7 @@ XERCES_CPP_NAMESPACE_BEGIN
UnixHTTPURLInputStream::UnixHTTPURLInputStream(const XMLURL& urlSource)
: fSocket(0)
, fBytesProcessed(0)
+ , fMemoryManager(urlSource.getMemoryManager())
{
//
@@ -222,8 +226,7 @@ UnixHTTPURLInputStream::UnixHTTPURLInputStream(const XMLURL& urlSource)
const XMLCh* hostName = urlSource.getHost();
const XMLCh* path = urlSource.getPath();
const XMLCh* fragment = urlSource.getFragment();
- const XMLCh* query = urlSource.getQuery();
- fMemoryManager = urlSource.getMemoryManager();
+ const XMLCh* query = urlSource.getQuery();
//
// Convert the hostName to the platform's code page for gethostbyname and
diff --git a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
index 532b704b5d6cfc747f0365f701ecfc686b144ef6..3af71baacb73658127f144560ae2ea1aeb1da5a1 100644
--- a/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:51:20 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/12/24 15:24:13 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -121,6 +124,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ UnixHTTPURLInputStream(const UnixHTTPURLInputStream&);
+ UnixHTTPURLInputStream& operator=(const UnixHTTPURLInputStream&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp b/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
index 8a805f6e670ca62ec555ae5f62c0834a4c2b88b6..60fa116f89a4b1efc861da842415dfb525b3724d 100644
--- a/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:51:20 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -130,6 +133,11 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinHTTPURLInputStream(const BinHTTPURLInputStream&);
+ BinHTTPURLInputStream& operator=(const BinHTTPURLInputStream&);
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp b/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
index c60f73d519ec6e22686a1cab00b2ac36f7516f19..aed015cd93de7c39c7b25a8051109d350e6c21b7 100644
--- a/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
+++ b/src/xercesc/util/NetAccessors/libWWW/BinURLInputStream.hpp
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.5 2004/01/29 11:51:20 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2004/01/15 16:07:16 amassari
* Fix for bug#24929; patch by Michael Wuschek
*
@@ -124,6 +127,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ BinURLInputStream(const BinURLInputStream&);
+ BinURLInputStream& operator=(const BinURLInputStream&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/util/OutOfMemoryException.hpp b/src/xercesc/util/OutOfMemoryException.hpp
index ac84439beab570b312ee7457333c6a37611a3acd..41380af5523394ee263d4b331489ea9add74cd52 100755
--- a/src/xercesc/util/OutOfMemoryException.hpp
+++ b/src/xercesc/util/OutOfMemoryException.hpp
@@ -96,8 +96,8 @@ public:
// constructors/destructors...
inline OutOfMemoryException::OutOfMemoryException() {}
inline OutOfMemoryException::~OutOfMemoryException() {}
-inline OutOfMemoryException::OutOfMemoryException(const OutOfMemoryException& toCopy) {}
-inline OutOfMemoryException& OutOfMemoryException::operator=(const OutOfMemoryException& toAssign)
+inline OutOfMemoryException::OutOfMemoryException(const OutOfMemoryException&) {}
+inline OutOfMemoryException& OutOfMemoryException::operator=(const OutOfMemoryException&)
{
return *this;
}
diff --git a/src/xercesc/util/PlatformUtils.hpp b/src/xercesc/util/PlatformUtils.hpp
index 98b7b9cc4c1e42018f7a62e67854ff9bacad756d..98a4f7c1c491f4b5264e6535a506aa6d8865e129 100644
--- a/src/xercesc/util/PlatformUtils.hpp
+++ b/src/xercesc/util/PlatformUtils.hpp
@@ -742,6 +742,11 @@ public :
static inline size_t alignPointerForNewBlockAllocation(size_t ptrSize);
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLPlatformUtils();
+
/** @name Private static methods */
//@{
diff --git a/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp b/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
index 10aaa513578878f9a0eee44961715527e3a3a753..6cee2cb6478478d83170689fe111915b58d33eae 100644
--- a/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.22 2004/01/29 11:51:20 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.21 2004/01/13 16:34:21 cargilld
* Misc memory management changes.
*
@@ -304,7 +307,7 @@ unsigned int XMLPlatformUtils::fileSize(FileHandle theFile
off_t curPos = ftell((FILE*) theFile);
if (curPos == -1)
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
- XMLExcepts::File_CouldNotGetCurPos, manger);
+ XMLExcepts::File_CouldNotGetCurPos, manager);
// Seek to the end and save that value for return
if (fseek((FILE*) theFile, 0, SEEK_END))
@@ -543,7 +546,7 @@ void XMLPlatformUtils::platformInit()
// mutex creation that must be broken.
if(!atomicOpsMutex)
{
- atomicOpsMutex = new (fgMemoryManager) atomicOpsMutex();
+ atomicOpsMutex = new (fgMemoryManager) XMLMutex();
if (atomicOpsMutex->fHandle == 0)
atomicOpsMutex->fHandle = XMLPlatformUtils::makeMutex();
}
diff --git a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
index 50da0e6b0fcef33a7bac5523b446f2f284910d25..1f32f72609f30c9091838732d37ea52d11fb58ac 100644
--- a/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
@@ -608,12 +608,12 @@ public:
tid.reservedHiId = 0;
tid.reservedLoId = 0;
tid.reservedHandle = 0;
- };
+ }
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
- };
+ }
void lock() {
if (pthread_equal(tid, pthread_self()))
@@ -625,7 +625,7 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
- };
+ }
void unlock() {
@@ -637,13 +637,13 @@ public:
tid.reservedHandle= 0;
tid.reservedHiId = 0;
tid.reservedLoId = 0;
- };
+ }
};
void* XMLPlatformUtils::makeMutex()
{
return new RecursiveMutex;
-};
+}
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
@@ -652,7 +652,7 @@ void XMLPlatformUtils::closeMutex(void* const mtxHandle)
return;
RecursiveMutex *rm = (RecursiveMutex *)mtxHandle;
delete rm;
-};
+}
void XMLPlatformUtils::lockMutex(void* const mtxHandle)
diff --git a/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp b/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
index 83da5ff102f694ee8221ddec5a6c48a12042170f..70ff887accffc8948fe1a1d49eb6e963afd3e9e4 100644
--- a/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2004/01/29 11:51:20 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.14 2004/01/13 16:34:21 cargilld
* Misc memory management changes.
*
@@ -505,13 +508,13 @@ public:
XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
- };
+ }
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
- };
+ }
void lock() {
if (pthread_equal(tid, pthread_self()))
@@ -524,7 +527,7 @@ public:
XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
- };
+ }
void unlock() {
if (--recursionCount > 0)
@@ -534,13 +537,13 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException,
XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
- };
+ }
};
void* XMLPlatformUtils::makeMutex()
{
return new RecursiveMutex;
-};
+}
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
{
@@ -549,7 +552,7 @@ void XMLPlatformUtils::closeMutex(void* const mtxHandle)
RecursiveMutex *rm = (RecursiveMutex *)mtxHandle;
delete rm;
-};
+}
void XMLPlatformUtils::lockMutex(void* const mtxHandle)
{
diff --git a/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp b/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
index f6afa26c1a7974a08190aa739fd443c42e0b3b4d..13b4d08f54f4c64bb6b12d4e9414410f81e45c1a 100644
--- a/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
@@ -476,12 +476,12 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
- };
+ }
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
- };
+ }
void lock() {
if (pthread_equal(tid, pthread_self()))
@@ -493,7 +493,7 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
- };
+ }
void unlock() {
@@ -503,7 +503,7 @@ public:
if (pthread_mutex_unlock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
- };
+ }
};
#endif // ifndef XML_USE_DCE
@@ -529,7 +529,7 @@ void* XMLPlatformUtils::makeMutex()
#else
return new RecursiveMutex;
#endif
-};
+}
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
@@ -543,7 +543,7 @@ void XMLPlatformUtils::closeMutex(void* const mtxHandle)
RecursiveMutex *rm = (RecursiveMutex *)mtxHandle;
#endif
delete rm;
-};
+}
void XMLPlatformUtils::lockMutex(void* const mtxHandle)
diff --git a/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp b/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
index 10e94f2ccac0db88703e0226fa9cc7419f040d4c..b946fa4e4f46e5d24381cff328f793a9732094c5 100644
--- a/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
@@ -467,13 +467,13 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
- };
+ }
~RecursiveMutex()
{
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
- };
+ }
void lock()
{
@@ -486,7 +486,7 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
- };
+ }
void unlock()
@@ -497,13 +497,13 @@ public:
if (pthread_mutex_unlock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
- };
+ }
};
void* XMLPlatformUtils::makeMutex()
{
return new RecursiveMutex;
-};
+}
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
@@ -512,7 +512,7 @@ void XMLPlatformUtils::closeMutex(void* const mtxHandle)
return;
RecursiveMutex *rm = (RecursiveMutex *)mtxHandle;
delete rm;
-};
+}
void XMLPlatformUtils::lockMutex(void* const mtxHandle)
diff --git a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
index e7a4647106de955b0a5e72ae4e5ae5ad6c379c6a..7bebe474bc1c33a1432e19ede9312d2979a9ba10 100644
--- a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.17 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.16 2004/01/13 16:34:22 cargilld
* Misc memory management changes.
*
@@ -549,12 +552,12 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotCreate, XMLPlatformUtils::fgMemoryManager);
recursionCount = 0;
tid = 0;
- };
+ }
~RecursiveMutex() {
if (pthread_mutex_destroy(&mutex))
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotDestroy, XMLPlatformUtils::fgMemoryManager);
- };
+ }
void lock() {
if (pthread_equal(tid, pthread_self()))
@@ -566,7 +569,7 @@ public:
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotLock, XMLPlatformUtils::fgMemoryManager);
tid = pthread_self();
recursionCount = 1;
- };
+ }
void unlock() {
@@ -576,13 +579,13 @@ public:
if (pthread_mutex_unlock(&mutex) != 0)
ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::Mutex_CouldNotUnlock, XMLPlatformUtils::fgMemoryManager);
tid = 0;
- };
+ }
};
void* XMLPlatformUtils::makeMutex()
{
return new RecursiveMutex;
-};
+}
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
@@ -591,7 +594,7 @@ void XMLPlatformUtils::closeMutex(void* const mtxHandle)
return;
RecursiveMutex *rm = (RecursiveMutex *)mtxHandle;
delete rm;
-};
+}
void XMLPlatformUtils::lockMutex(void* const mtxHandle)
diff --git a/src/xercesc/util/QName.hpp b/src/xercesc/util/QName.hpp
index 6f02b486200e22676a04a5b4c764f562f72a7637..212d092baa695ab8e9ccae0fca89bc5dc4366b80 100644
--- a/src/xercesc/util/QName.hpp
+++ b/src/xercesc/util/QName.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/09/25 15:22:34 peiyongz
* Implementation of Serialization
*
@@ -211,6 +214,10 @@ public :
DECL_XSERIALIZABLE(QName)
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ QName& operator=(const QName&);
// -----------------------------------------------------------------------
// Private instance variables
diff --git a/src/xercesc/util/RefArrayOf.hpp b/src/xercesc/util/RefArrayOf.hpp
index ad66ce6b563bdd4d2e6c81c36f27995df42f0bcf..986fadf02edd514aa1d04cca37b1407acce4f695 100644
--- a/src/xercesc/util/RefArrayOf.hpp
+++ b/src/xercesc/util/RefArrayOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -165,7 +168,7 @@ private :
// An enumerator for a reference array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class RefArrayEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class RefArrayEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -188,6 +191,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefArrayEnumerator(const RefArrayEnumerator<TElem>&);
+ RefArrayEnumerator<TElem>& operator=(const RefArrayEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
diff --git a/src/xercesc/util/RefArrayVectorOf.hpp b/src/xercesc/util/RefArrayVectorOf.hpp
index a861b59a3317ac0f3c0500734c0abfa3deb86d53..651aa46b6a8b8d7b71d6f8ef90a6a028f44fd7a0 100644
--- a/src/xercesc/util/RefArrayVectorOf.hpp
+++ b/src/xercesc/util/RefArrayVectorOf.hpp
@@ -88,6 +88,12 @@ public :
void removeElementAt(const unsigned int removeAt);
void removeLastElement();
void cleanup();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefArrayVectorOf(const RefArrayVectorOf<TElem>&);
+ RefArrayVectorOf<TElem>& operator=(const RefArrayVectorOf<TElem>&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/RefHash2KeysTableOf.hpp b/src/xercesc/util/RefHash2KeysTableOf.hpp
index 1b5a006b8e019910638aa85c9d23f001b29fc855..09889b1c2f999fe3e34352b4089cd95dde95791a 100644
--- a/src/xercesc/util/RefHash2KeysTableOf.hpp
+++ b/src/xercesc/util/RefHash2KeysTableOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -134,11 +137,19 @@ template <class TVal> struct RefHash2KeysTableBucketElem : public XMemory
: fData(value), fNext(next), fKey1(key1), fKey2(key2)
{
}
+ ~RefHash2KeysTableBucketElem() {};
TVal* fData;
RefHash2KeysTableBucketElem<TVal>* fNext;
void* fKey1;
int fKey2;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash2KeysTableBucketElem(const RefHash2KeysTableBucketElem<TVal>&);
+ RefHash2KeysTableBucketElem<TVal>& operator=(const RefHash2KeysTableBucketElem<TVal>&);
};
@@ -204,6 +215,11 @@ private :
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash2KeysTableOf(const RefHash2KeysTableOf<TVal>&);
+ RefHash2KeysTableOf<TVal>& operator=(const RefHash2KeysTableOf<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -271,6 +287,12 @@ public :
void nextElementKey(void*&, int&);
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash2KeysTableOfEnumerator(const RefHash2KeysTableOfEnumerator<TVal>&);
+ RefHash2KeysTableOfEnumerator<TVal>& operator=(const RefHash2KeysTableOfEnumerator<TVal>&);
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/RefHash3KeysIdPool.c b/src/xercesc/util/RefHash3KeysIdPool.c
index a6b0a8dc098814dce76386fd018f50aa81d11568..a5c059715057c08f0ed2e16f4b9deb479b5762ae 100644
--- a/src/xercesc/util/RefHash3KeysIdPool.c
+++ b/src/xercesc/util/RefHash3KeysIdPool.c
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.10 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -469,6 +472,16 @@ template <class TVal> RefHash3KeysIdPoolEnumerator<TVal>::~RefHash3KeysIdPoolEnu
delete fToEnum;
}
+template <class TVal> RefHash3KeysIdPoolEnumerator<TVal>::
+RefHash3KeysIdPoolEnumerator(const RefHash3KeysIdPoolEnumerator<TVal>& toCopy) :
+ fAdoptedElems(toCopy.fAdoptedElems)
+ , fCurIndex(toCopy.fCurIndex)
+ , fToEnum(toCopy.fToEnum)
+ , fCurElem(toCopy.fCurElem)
+ , fCurHash(toCopy.fCurHash)
+ , fMemoryManager(toCopy.fMemoryManager)
+{
+}
// ---------------------------------------------------------------------------
// RefHash3KeysIdPoolEnumerator: Enum interface
diff --git a/src/xercesc/util/RefHash3KeysIdPool.hpp b/src/xercesc/util/RefHash3KeysIdPool.hpp
index ad502fb2afc567126ddc1cb6d49c78a74187082d..ebe447051f71d398794ddf2bf1757404a81db68c 100644
--- a/src/xercesc/util/RefHash3KeysIdPool.hpp
+++ b/src/xercesc/util/RefHash3KeysIdPool.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -144,12 +147,21 @@ template <class TVal> struct RefHash3KeysTableBucketElem : public XMemory
, fKey3(key3)
{
}
+
+ RefHash3KeysTableBucketElem() {};
TVal* fData;
RefHash3KeysTableBucketElem<TVal>* fNext;
void* fKey1;
int fKey2;
int fKey3;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash3KeysTableBucketElem(const RefHash3KeysTableBucketElem<TVal>&);
+ RefHash3KeysTableBucketElem<TVal>& operator=(const RefHash3KeysTableBucketElem<TVal>&);
};
@@ -221,6 +233,11 @@ private :
friend class RefHash3KeysIdPoolEnumerator<TVal>;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash3KeysIdPool(const RefHash3KeysIdPool<TVal>&);
+ RefHash3KeysIdPool<TVal>& operator=(const RefHash3KeysIdPool<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -279,7 +296,7 @@ private:
// An enumerator for a value array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TVal> class RefHash3KeysIdPoolEnumerator : public XMLEnumerator<TVal>
+template <class TVal> class RefHash3KeysIdPoolEnumerator : public XMLEnumerator<TVal>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -290,7 +307,7 @@ public :
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual ~RefHash3KeysIdPoolEnumerator();
-
+ RefHash3KeysIdPoolEnumerator(const RefHash3KeysIdPoolEnumerator<TVal>&);
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
@@ -307,6 +324,10 @@ public :
bool hasMoreKeys() const;
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHash3KeysIdPoolEnumerator<TVal>& operator=(const RefHash3KeysIdPoolEnumerator<TVal>&);
// -----------------------------------------------------------------------
// Private methods
diff --git a/src/xercesc/util/RefHashTableOf.c b/src/xercesc/util/RefHashTableOf.c
index 89c6f8d423851bbfcccf691549a14caf7e937e8f..db25f8658abc830bd88cf6d350f18eed51fbf163 100644
--- a/src/xercesc/util/RefHashTableOf.c
+++ b/src/xercesc/util/RefHashTableOf.c
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.13 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -641,6 +644,15 @@ template <class TVal> RefHashTableOfEnumerator<TVal>::~RefHashTableOfEnumerator(
}
+template <class TVal> RefHashTableOfEnumerator<TVal>::
+RefHashTableOfEnumerator(const RefHashTableOfEnumerator<TVal>& toCopy) :
+ fAdopted(toCopy.fAdopted)
+ , fCurElem(toCopy.fCurElem)
+ , fCurHash(toCopy.fCurHash)
+ , fToEnum(toCopy.fToEnum)
+ , fMemoryManager(toCopy.fMemoryManager)
+{
+}
// ---------------------------------------------------------------------------
// RefHashTableOfEnumerator: Enum interface
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/RefHashTableOf.hpp b/src/xercesc/util/RefHashTableOf.hpp
index 0953de6c8bfc421aba89f685562822cdcbb799fc..37fd36a68fc1470e15120b7db012907111e3131f 100644
--- a/src/xercesc/util/RefHashTableOf.hpp
+++ b/src/xercesc/util/RefHashTableOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -168,9 +171,18 @@ template <class TVal> struct RefHashTableBucketElem : public XMemory
{
}
+ RefHashTableBucketElem(){};
+
TVal* fData;
RefHashTableBucketElem<TVal>* fNext;
void* fKey;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHashTableBucketElem(const RefHashTableBucketElem<TVal>&);
+ RefHashTableBucketElem<TVal>& operator=(const RefHashTableBucketElem<TVal>&);
};
@@ -244,6 +256,11 @@ private :
friend class RefHashTableOfEnumerator<TVal>;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHashTableOf(const RefHashTableOf<TVal>&);
+ RefHashTableOf<TVal>& operator=(const RefHashTableOf<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -300,7 +317,7 @@ public :
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual ~RefHashTableOfEnumerator();
-
+ RefHashTableOfEnumerator(const RefHashTableOfEnumerator<TVal>&);
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
@@ -314,6 +331,11 @@ public :
void* nextElementKey();
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefHashTableOfEnumerator<TVal>& operator=(const RefHashTableOfEnumerator<TVal>&);
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/RefStackOf.hpp b/src/xercesc/util/RefStackOf.hpp
index a2f2213c09c932ebdf6186f535e63fc76a28dae4..48ce0034637202a4694b8f94ee0daa83ff82eadd 100644
--- a/src/xercesc/util/RefStackOf.hpp
+++ b/src/xercesc/util/RefStackOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -141,6 +144,11 @@ private :
// -----------------------------------------------------------------------
friend class RefStackEnumerator<TElem>;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefStackOf(const RefStackOf<TElem>&);
+ RefStackOf<TElem>& operator=(const RefStackOf<TElem>&);
// -----------------------------------------------------------------------
// Data Members
@@ -158,7 +166,7 @@ private :
// An enumerator for a value stack. It derives from the basic enumerator
// class, so that value stacks can be generically enumerated.
//
-template <class TElem> class RefStackEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class RefStackEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -181,6 +189,11 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefStackEnumerator(const RefStackEnumerator<TElem>&);
+ RefStackEnumerator<TElem>& operator=(const RefStackEnumerator<TElem>&);
// -----------------------------------------------------------------------
// Data Members
//
diff --git a/src/xercesc/util/RefVectorOf.hpp b/src/xercesc/util/RefVectorOf.hpp
index 3989fec5736224a1b800e499ed7eaa542929332f..18d0a35994a66c6d4321338f86b6d84b78b59bf5 100644
--- a/src/xercesc/util/RefVectorOf.hpp
+++ b/src/xercesc/util/RefVectorOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -130,6 +133,12 @@ public :
// -----------------------------------------------------------------------
~RefVectorOf();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RefVectorOf(const RefVectorOf<TElem>&);
+ RefVectorOf<TElem>& operator=(const RefVectorOf<TElem>&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/SecurityManager.hpp b/src/xercesc/util/SecurityManager.hpp
index f23b00abf598bfed2b836b6222dffeb5946c74c9..63268598d92eaa1c76d306a9970337f5f80695a3 100644
--- a/src/xercesc/util/SecurityManager.hpp
+++ b/src/xercesc/util/SecurityManager.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/04/22 12:53:38 neilg
* change const static member to an enum to make MSVC happy
*
@@ -126,8 +129,8 @@ public:
//@{
/** Default constructor */
SecurityManager()
- {
- fEntityExpansionLimit = ENTITY_EXPANSION_LIMIT;
+ : fEntityExpansionLimit(ENTITY_EXPANSION_LIMIT)
+ {
}
/** Destructor */
diff --git a/src/xercesc/util/StringPool.cpp b/src/xercesc/util/StringPool.cpp
index 57a7a608786dc240c68650c5618aa6923052f83a..cb46da7509adbbc6ff395be621177c1662428cec 100644
--- a/src/xercesc/util/StringPool.cpp
+++ b/src/xercesc/util/StringPool.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -318,9 +321,22 @@ void XMLStringPool::serialize(XSerializeEngine& serEng)
}
}
-XMLStringPool::XMLStringPool(MemoryManager* const manager)
+XMLStringPool::XMLStringPool(MemoryManager* const manager) :
+ fMemoryManager(manager)
+ , fIdMap(0)
+ , fHashTable(0)
+ , fMapCapacity(64)
+ , fCurId(1)
{
- XMLStringPool(109, manager);
+ // Create the hash table, passing it the modulus
+ fHashTable = new (fMemoryManager) RefHashTableOf<PoolElem>(109, fMemoryManager);
+
+ // Do an initial allocation of the id map and zero it all out
+ fIdMap = (PoolElem**) fMemoryManager->allocate
+ (
+ fMapCapacity * sizeof(PoolElem*)
+ ); //new PoolElem*[fMapCapacity];
+ memset(fIdMap, 0, sizeof(PoolElem*) * fMapCapacity);
}
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/TransService.cpp b/src/xercesc/util/TransService.cpp
index 50946fb9a0c8afe5a38a55e448544f7434303573..8258c595bfde43604e03ddd12f175a973461a10b 100644
--- a/src/xercesc/util/TransService.cpp
+++ b/src/xercesc/util/TransService.cpp
@@ -541,8 +541,8 @@ XMLTranscoder::~XMLTranscoder()
XMLTranscoder::XMLTranscoder(const XMLCh* const encodingName
, const unsigned int blockSize
, MemoryManager* const manager) :
- fEncodingName(0)
- , fBlockSize(blockSize)
+ fBlockSize(blockSize)
+ , fEncodingName(0)
, fMemoryManager(manager)
{
fEncodingName = XMLString::replicate(encodingName, fMemoryManager);
@@ -552,7 +552,7 @@ XMLTranscoder::XMLTranscoder(const XMLCh* const encodingName
// ---------------------------------------------------------------------------
// XMLTranscoder: Protected helpers
// ---------------------------------------------------------------------------
-void XMLTranscoder::checkBlockSize(const unsigned int toCheck)
+void XMLTranscoder::checkBlockSize(const unsigned int)
{
// if (toCheck > fBlockSize)
// ThrowXML(TranscodingException, XMLExcepts::Trans_BadBlockSize);
diff --git a/src/xercesc/util/TransService.hpp b/src/xercesc/util/TransService.hpp
index 64d30f8281836b365d30c6ff4fdc3b7858c4d2a1..46ccd02a5c2e93cc2b39af500a6887e3e00c1d3a 100644
--- a/src/xercesc/util/TransService.hpp
+++ b/src/xercesc/util/TransService.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/12/24 15:24:13 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -488,6 +491,9 @@ protected :
// -----------------------------------------------------------------------
// Protected helper methods
// -----------------------------------------------------------------------
+ // As the body of this function is commented out it could be removed.
+ // However, currently all calls to it are guarded by #if defined(XERCES_DEBUG)
+ // so will leave it for now.
void checkBlockSize(const unsigned int toCheck);
diff --git a/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp b/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
index 91da8e198d65475e2c36aaca36305bc934f3537a..b6833b23655c1b2298e0b50dc87660a7198dda5b 100644
--- a/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
+++ b/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
@@ -532,7 +532,7 @@ ICUTranscoder::transcodeFrom(const XMLByte* const srcData
//
if (fFixed)
{
- const unsigned char fillSize = (unsigned char)ucnv_getMaxCharSize(fConverter);;
+ const unsigned char fillSize = (unsigned char)ucnv_getMaxCharSize(fConverter);
memset(charSizes, fillSize, maxChars);
}
else
diff --git a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
index 6cc6e2628221ef6cc0bb5dc00a534861cbb7f70e..09e952e5d258397a939e1036485772e22f0299f4 100644
--- a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
@@ -214,7 +214,7 @@ bool IconvTransService::supportsSrcOfs() const
// IconvTransService: The protected virtual transcoding service API
// ---------------------------------------------------------------------------
XMLTranscoder*
-IconvTransService::makeNewXMLTranscoder(const XMLCh* const encodingName
+IconvTransService::makeNewXMLTranscoder(const XMLCh* const
, XMLTransService::Codes& resValue
, const unsigned int
, MemoryManager* const)
diff --git a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
index f33cd8ac50223aa17541e90c1e91f2b6e0b78450..27dc3302cb9bea60d45f4330ab3161fec4ca0270 100644
--- a/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
@@ -458,7 +458,7 @@ Iconv400Transcoder::transcodeFrom(const XMLByte* const srcData
//
if (fFixed)
{
- const unsigned char fillSize = (unsigned char)ucnv_getMaxCharSize(fConverter);;
+ const unsigned char fillSize = (unsigned char)ucnv_getMaxCharSize(fConverter);
memset(charSizes, fillSize, maxChars);
}
else
diff --git a/src/xercesc/util/ValueArrayOf.hpp b/src/xercesc/util/ValueArrayOf.hpp
index 92a4910c21ca99622a4f02af9dce76184d56e64a..8f64606b653e819fefa6ce0540a9230c9fae246c 100644
--- a/src/xercesc/util/ValueArrayOf.hpp
+++ b/src/xercesc/util/ValueArrayOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 06:01:52 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -166,7 +169,7 @@ private :
// An enumerator for a value array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class ValueArrayEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class ValueArrayEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -189,6 +192,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueArrayEnumerator(const ValueArrayEnumerator<TElem>&);
+ ValueArrayEnumerator<TElem>& operator=(const ValueArrayEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
diff --git a/src/xercesc/util/ValueHashTableOf.hpp b/src/xercesc/util/ValueHashTableOf.hpp
index 8f93b6bcd1bb9659872628d95c42be0768ac751d..3907c4b84074761eb4558f0c8514f44e624adbfd 100644
--- a/src/xercesc/util/ValueHashTableOf.hpp
+++ b/src/xercesc/util/ValueHashTableOf.hpp
@@ -91,10 +91,18 @@ template <class TVal> struct ValueHashTableBucketElem : public XMemory
: fData(value), fNext(next), fKey(key)
{
}
+ ValueHashTableBucketElem(){};
TVal fData;
ValueHashTableBucketElem<TVal>* fNext;
void* fKey;
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueHashTableBucketElem(const ValueHashTableBucketElem<TVal>&);
+ ValueHashTableBucketElem<TVal>& operator=(const ValueHashTableBucketElem<TVal>&);
};
@@ -151,6 +159,11 @@ private :
friend class ValueHashTableOfEnumerator<TVal>;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueHashTableOf(const ValueHashTableOf<TVal>&);
+ ValueHashTableOf<TVal>& operator=(const ValueHashTableOf<TVal>&);
// -----------------------------------------------------------------------
// Private methods
@@ -187,7 +200,7 @@ private:
// An enumerator for a value array. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TVal> class ValueHashTableOfEnumerator : public XMLEnumerator<TVal>
+template <class TVal> class ValueHashTableOfEnumerator : public XMLEnumerator<TVal>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -213,6 +226,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueHashTableOfEnumerator(const ValueHashTableOfEnumerator<TVal>&);
+ ValueHashTableOfEnumerator<TVal>& operator=(const ValueHashTableOfEnumerator<TVal>&);
+
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/ValueStackOf.hpp b/src/xercesc/util/ValueStackOf.hpp
index 6257bc63de8e975ff1d55027505f23110c159e7e..d04e432dc6847587559753075efc771f62bf871a 100644
--- a/src/xercesc/util/ValueStackOf.hpp
+++ b/src/xercesc/util/ValueStackOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/05/29 13:26:44 knoaman
* Fix memory leak when using deprecated dom.
*
@@ -141,6 +144,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueStackOf(const ValueStackOf<TElem>&);
+ ValueStackOf<TElem>& operator=(const ValueStackOf<TElem>&);
+
// -----------------------------------------------------------------------
// Declare our friends
// -----------------------------------------------------------------------
@@ -163,7 +172,7 @@ private :
// An enumerator for a value stack. It derives from the basic enumerator
// class, so that value stacks can be generically enumerated.
//
-template <class TElem> class ValueStackEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class ValueStackEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -186,6 +195,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueStackEnumerator(const ValueStackEnumerator<TElem>&);
+ ValueStackEnumerator<TElem>& operator=(const ValueStackEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
diff --git a/src/xercesc/util/ValueVectorOf.hpp b/src/xercesc/util/ValueVectorOf.hpp
index d0871331ce47e97a98a520ac4981299a0869af72..e8983277c6860a56eb5bdef87ea1a0fd2e79d1fb 100644
--- a/src/xercesc/util/ValueVectorOf.hpp
+++ b/src/xercesc/util/ValueVectorOf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/05/29 13:26:44 knoaman
* Fix memory leak when using deprecated dom.
*
@@ -190,7 +193,7 @@ private:
// An enumerator for a value vector. It derives from the basic enumerator
// class, so that value vectors can be generically enumerated.
//
-template <class TElem> class ValueVectorEnumerator : public XMLEnumerator<TElem>
+template <class TElem> class ValueVectorEnumerator : public XMLEnumerator<TElem>, public XMemory
{
public :
// -----------------------------------------------------------------------
@@ -213,6 +216,12 @@ public :
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ValueVectorEnumerator(const ValueVectorEnumerator<TElem>&);
+ ValueVectorEnumerator<TElem>& operator=(const ValueVectorEnumerator<TElem>&);
+
// -----------------------------------------------------------------------
// Data Members
//
diff --git a/src/xercesc/util/XMLAbstractDoubleFloat.cpp b/src/xercesc/util/XMLAbstractDoubleFloat.cpp
index 519f1f85ab9ec906657619a03add0b894bf16dd6..3059c31416eee6ba528f923d641adbc1882c3b41 100644
--- a/src/xercesc/util/XMLAbstractDoubleFloat.cpp
+++ b/src/xercesc/util/XMLAbstractDoubleFloat.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.26 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.25 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -356,7 +359,7 @@ int XMLAbstractDoubleFloat::compareValues(const XMLAbstractDoubleFloat* const lV
if ((lValue->isSpecialValue()) &&
(!rValue->isSpecialValue()) )
{
- return compareSpecial(lValue, rValue, manager);
+ return compareSpecial(lValue, manager);
}
//
// case#4: lValue normal
@@ -364,14 +367,13 @@ int XMLAbstractDoubleFloat::compareValues(const XMLAbstractDoubleFloat* const lV
//
else
{
- return (-1) * compareSpecial(rValue, lValue, manager);
+ return (-1) * compareSpecial(rValue, manager);
}
return 0;
}
-int XMLAbstractDoubleFloat::compareSpecial(const XMLAbstractDoubleFloat* const specialValue
- , const XMLAbstractDoubleFloat* const normalValue
+int XMLAbstractDoubleFloat::compareSpecial(const XMLAbstractDoubleFloat* const specialValue
, MemoryManager* const manager)
{
switch (specialValue->fType)
diff --git a/src/xercesc/util/XMLAbstractDoubleFloat.hpp b/src/xercesc/util/XMLAbstractDoubleFloat.hpp
index bf2313bfa3c83856497a5d2d801d42661fef68f1..0dea40243761c212110564612fbc6ae7f1affc38 100644
--- a/src/xercesc/util/XMLAbstractDoubleFloat.hpp
+++ b/src/xercesc/util/XMLAbstractDoubleFloat.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.20 2004/01/29 11:48:46 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.19 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -260,8 +263,7 @@ private:
inline bool isSpecialValue() const;
- static int compareSpecial(const XMLAbstractDoubleFloat* const specialValue
- , const XMLAbstractDoubleFloat* const normalValue
+ static int compareSpecial(const XMLAbstractDoubleFloat* const specialValue
, MemoryManager* const manager);
void formatString();
diff --git a/src/xercesc/util/XMLBigInteger.hpp b/src/xercesc/util/XMLBigInteger.hpp
index 947926f47d208f10e330ba34e76cf523b868dbe5..09819120469074a6759fd10948e195033bcf5e1e 100644
--- a/src/xercesc/util/XMLBigInteger.hpp
+++ b/src/xercesc/util/XMLBigInteger.hpp
@@ -152,6 +152,11 @@ public:
int intValue() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLBigInteger& operator=(const XMLBigInteger&);
+
void setSign(int);
diff --git a/src/xercesc/util/XMLChTranscoder.cpp b/src/xercesc/util/XMLChTranscoder.cpp
index 088cdbaabff9ce073b97f9c02c0656848cdb70d3..4931439ef15e13d2c77b8b2efb8e3f6ae6676388 100644
--- a/src/xercesc/util/XMLChTranscoder.cpp
+++ b/src/xercesc/util/XMLChTranscoder.cpp
@@ -127,7 +127,7 @@ XMLChTranscoder::transcodeTo(const XMLCh* const srcData
, XMLByte* const toFill
, const unsigned int maxBytes
, unsigned int& charsEaten
- , const UnRepOpts options)
+ , const UnRepOpts)
{
// If debugging, make sure that the block size is legal
#if defined(XERCES_DEBUG)
@@ -158,7 +158,7 @@ XMLChTranscoder::transcodeTo(const XMLCh* const srcData
}
-bool XMLChTranscoder::canTranscodeTo(const unsigned int toCheck) const
+bool XMLChTranscoder::canTranscodeTo(const unsigned int) const
{
// We can handle anything
return true;
diff --git a/src/xercesc/util/XMLChar.cpp b/src/xercesc/util/XMLChar.cpp
index 9c4c56303b53c29327c0869e9288fdf6924392ea..659b6e529bc95166516eddcd96958765494107b9 100644
--- a/src/xercesc/util/XMLChar.cpp
+++ b/src/xercesc/util/XMLChar.cpp
@@ -8922,6 +8922,12 @@ public :
initCharFlagTable();
initCharFlagTable1_1();
}
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented methods.
+ // -----------------------------------------------------------------------
+ CharFlagKicker(const CharFlagKicker&);
+ CharFlagKicker& operator=(const CharFlagKicker&);
};
static CharFlagKicker gKicker;
diff --git a/src/xercesc/util/XMLChar.hpp b/src/xercesc/util/XMLChar.hpp
index f1ea9041b69008dfdd984d763d1b7e4df424e9df..9a22dafeb7a498d52eb886d0f9c419b30d064d3c 100644
--- a/src/xercesc/util/XMLChar.hpp
+++ b/src/xercesc/util/XMLChar.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/08/14 02:57:27 knoaman
* Code refactoring to improve performance of validation.
*
@@ -153,6 +156,11 @@ public:
static void enableNELWS();
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLChar1_0();
+
// -----------------------------------------------------------------------
// Static data members
//
@@ -307,6 +315,11 @@ public:
static bool isPublicIdChar(const XMLCh toCheck, const XMLCh toCheck2 = 0);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLChar1_1();
+
// -----------------------------------------------------------------------
// Static data members
//
diff --git a/src/xercesc/util/XMLDOMMsg.hpp b/src/xercesc/util/XMLDOMMsg.hpp
index 29916838fbd9cee66c7f1ed8bff5c3e3646d657f..aaf8a07a45584e290dd7c3cdf127b9e1896f0188 100644
--- a/src/xercesc/util/XMLDOMMsg.hpp
+++ b/src/xercesc/util/XMLDOMMsg.hpp
@@ -79,6 +79,12 @@ public :
return DOMError::DOM_SEVERITY_FATAL_ERROR;
else return DOMError::DOM_SEVERITY_ERROR;
}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLDOMMsg();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/XMLDateTime.cpp b/src/xercesc/util/XMLDateTime.cpp
index 88cee656c5ab9d814d6ed03d8be70a4cccf85d70..17df97830c1d94387104ae7dc33250d964dff6c3 100644
--- a/src/xercesc/util/XMLDateTime.cpp
+++ b/src/xercesc/util/XMLDateTime.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.25 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.24 2004/01/25 23:23:26 jberry
* Step around CodeWarrior compiler warning
*
@@ -402,8 +405,8 @@ void XMLDateTime::addDuration(XMLDateTime* fNewDate
fNewDate->fValue[utc] = UTC_STD;
}
-int XMLDateTime::compareResult(short resultA
- , short resultB
+int XMLDateTime::compareResult(int resultA
+ , int resultB
, bool strict)
{
@@ -446,7 +449,7 @@ int XMLDateTime::compare(const XMLDateTime* const pDate1
return XMLDateTime::compareOrder(pDate1, pDate2);
}
- short c1, c2;
+ int c1, c2;
if ( pDate1->isNormalized())
{
@@ -1540,8 +1543,8 @@ XMLCh* XMLDateTime::getDateTimeCanonicalRepresentation(MemoryManager* const memM
// (-?) cc+yy-mm-dd'T'hh:mm:ss'Z' ('.'s+)?
// 2+ 8 1 8 1
//
- int additionalLen = 0;
- if (0 != (additionalLen = fillYearString(retPtr, CentYear)))
+ int additionalLen = fillYearString(retPtr, CentYear);
+ if(additionalLen != 0)
{
// very bad luck; have to resize the buffer...
XMLCh *tmpBuf = (XMLCh*) toUse->allocate( (additionalLen+21+miliSecondsLen +2) * sizeof(XMLCh));
diff --git a/src/xercesc/util/XMLDateTime.hpp b/src/xercesc/util/XMLDateTime.hpp
index d50d256ce6dbca3e833f1e38bca02e1c44902605..89128afba1f68e1d22f2fe71c791bb10024b01d0 100644
--- a/src/xercesc/util/XMLDateTime.hpp
+++ b/src/xercesc/util/XMLDateTime.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.17 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.16 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -253,8 +256,8 @@ private:
// -----------------------------------------------------------------------
// Comparison
// -----------------------------------------------------------------------
- static int compareResult(short
- , short
+ static int compareResult(int
+ , int
, bool);
static void addDuration(XMLDateTime* pDuration
diff --git a/src/xercesc/util/XMLDeleterFor.hpp b/src/xercesc/util/XMLDeleterFor.hpp
index 195981a8c9ac3588e8e1185f402386004d573184..74923164b898b369bea1116ed3ba46d12e2f5d04 100644
--- a/src/xercesc/util/XMLDeleterFor.hpp
+++ b/src/xercesc/util/XMLDeleterFor.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/03/07 18:11:55 tng
* Return a reference instead of void for operator=
*
@@ -110,7 +113,7 @@ private :
// -----------------------------------------------------------------------
XMLDeleterFor();
XMLDeleterFor(const XMLDeleterFor<T>&);
- XMLDeleterFor& operator=(const XMLDeleterFor<T>&);
+ XMLDeleterFor<T>& operator=(const XMLDeleterFor<T>&);
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/XMLEnumerator.hpp b/src/xercesc/util/XMLEnumerator.hpp
index 15d69b09827d91beeb3c62b5420a61033173e8cd..47d4788bdcd1fa2726eaee5e501c5dfd2acfb941 100644
--- a/src/xercesc/util/XMLEnumerator.hpp
+++ b/src/xercesc/util/XMLEnumerator.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2002/11/04 15:22:05 tng
* C++ Namespace Support.
*
@@ -106,6 +109,15 @@ public :
virtual bool hasMoreElements() const = 0;
virtual TElem& nextElement() = 0;
virtual void Reset() = 0;
+
+ XMLEnumerator() {};
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLEnumerator(const XMLEnumerator<TElem>&);
+ XMLEnumerator<TElem>& operator=(const XMLEnumerator<TElem>&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/XMLExceptMsgs.hpp b/src/xercesc/util/XMLExceptMsgs.hpp
index 0405ccd862aed7b45cbe0b0b2d23d9e71b9ade26..aebc865ef5dc220be111aa39cc6eed836f5799ef 100644
--- a/src/xercesc/util/XMLExceptMsgs.hpp
+++ b/src/xercesc/util/XMLExceptMsgs.hpp
@@ -412,6 +412,11 @@ public :
, E_HighBounds = 396
};
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLExcepts();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/XMLException.cpp b/src/xercesc/util/XMLException.cpp
index b97d1193910faf7d28fa2f5548f1a8a0627ceadc..37173310b39c50c8bd6ab20f1c23f943bcf73299 100644
--- a/src/xercesc/util/XMLException.cpp
+++ b/src/xercesc/util/XMLException.cpp
@@ -209,10 +209,9 @@ XMLException::XMLException(const XMLException& toCopy) :
fCode(toCopy.fCode)
, fSrcFile(0)
, fSrcLine(toCopy.fSrcLine)
- , fMemoryManager(toCopy.fMemoryManager)
+ , fMsg(XMLString::replicate(toCopy.fMsg, toCopy.fMemoryManager))
+ , fMemoryManager(toCopy.fMemoryManager)
{
- fMsg = XMLString::replicate(toCopy.fMsg, fMemoryManager);
-
if (toCopy.fSrcFile) {
fSrcFile = XMLString::replicate
(
diff --git a/src/xercesc/util/XMLInteger.hpp b/src/xercesc/util/XMLInteger.hpp
index 5f9f06b5209b35de1c258132d395beb85b76fabb..124e8c185734954da8c48ea01dcb6bbff99ecddd 100644
--- a/src/xercesc/util/XMLInteger.hpp
+++ b/src/xercesc/util/XMLInteger.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/05/15 19:07:46 knoaman
* Partial implementation of the configurable memory manager.
*
@@ -98,6 +101,11 @@ public:
int intValue() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLInteger(const XMLInteger&);
+ XMLInteger& operator=(const XMLInteger&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/util/XMLNumber.cpp b/src/xercesc/util/XMLNumber.cpp
index 5ba03bfe1753ded4a5fe472b47878ee16952d9ea..6d1570998c68d5c762fcc6d77a3c146815dd3cd8 100644
--- a/src/xercesc/util/XMLNumber.cpp
+++ b/src/xercesc/util/XMLNumber.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/10/17 21:10:55 peiyongz
* loadNumber() added
*
@@ -104,7 +107,7 @@ XMLNumber::~XMLNumber()
IMPL_XSERIALIZABLE_NOCREATE(XMLNumber)
-void XMLNumber::serialize(XSerializeEngine& serEng)
+void XMLNumber::serialize(XSerializeEngine&)
{
// this class has no data to serialize/de-serilize
}
diff --git a/src/xercesc/util/XMLNumber.hpp b/src/xercesc/util/XMLNumber.hpp
index 42997b845db672d0d93ae90bf4616ad7afd2d1b6..436621f787cb39b0c69a231048d1616e5a1d9758 100644
--- a/src/xercesc/util/XMLNumber.hpp
+++ b/src/xercesc/util/XMLNumber.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2004/01/13 19:50:56 peiyongz
* remove parseContent()
*
@@ -178,6 +181,12 @@ protected:
XMLNumber();
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLNumber(const XMLNumber&);
+ XMLNumber& operator=(const XMLNumber&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/XMLRegisterCleanup.hpp b/src/xercesc/util/XMLRegisterCleanup.hpp
index e4f916030b86f531b4825d0fa7f85732a2e100d3..192da4fe93668a3de84add6d070f9d6f919b0238 100644
--- a/src/xercesc/util/XMLRegisterCleanup.hpp
+++ b/src/xercesc/util/XMLRegisterCleanup.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2002/11/04 15:22:05 tng
* C++ Namespace Support.
*
@@ -180,12 +183,11 @@ public :
}
private:
-
- //
- // unsupported ctor and operator
- //
- XMLRegisterCleanup(const XMLRegisterCleanup&)
- {}
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLRegisterCleanup(const XMLRegisterCleanup&);
+ XMLRegisterCleanup& operator=(const XMLRegisterCleanup&);
// This is the cleanup function to be called
XMLCleanupFn m_cleanupFn;
diff --git a/src/xercesc/util/XMLResourceIdentifier.hpp b/src/xercesc/util/XMLResourceIdentifier.hpp
index b1a89a45f4947e86450c5a7e5240ca5c457f9550..07470c6c64b65a14a4028734d8a56972cfeb1d80 100644
--- a/src/xercesc/util/XMLResourceIdentifier.hpp
+++ b/src/xercesc/util/XMLResourceIdentifier.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/11/25 18:16:38 knoaman
* Documentation update. Thanks to David Cargill.
*
@@ -233,12 +236,12 @@ inline XMLResourceIdentifier::XMLResourceIdentifier(const ResourceIdentifierType
, const XMLCh* const systemId
, const XMLCh* const nameSpace
, const XMLCh* const publicId
- , const XMLCh* const baseURI ) :
- fResourceIdentifierType(resourceIdentifierType),
- fSystemId(systemId),
- fNameSpace(nameSpace),
- fPublicId(publicId),
- fBaseURI(baseURI)
+ , const XMLCh* const baseURI )
+ : fResourceIdentifierType(resourceIdentifierType)
+ , fPublicId(publicId)
+ , fSystemId(systemId)
+ , fBaseURI(baseURI)
+ , fNameSpace(nameSpace)
{
}
diff --git a/src/xercesc/util/XMLStringTokenizer.cpp b/src/xercesc/util/XMLStringTokenizer.cpp
index e08b9650ae4301cc69f1ed8918ca5c915c8835c4..00900150a8c86b45940948b7875c053a3b1a65ea 100644
--- a/src/xercesc/util/XMLStringTokenizer.cpp
+++ b/src/xercesc/util/XMLStringTokenizer.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:48:47 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:35 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -107,13 +110,11 @@ XMLStringTokenizer::XMLStringTokenizer( const XMLCh* const srcStr
: fOffset(0)
, fStringLen(XMLString::stringLen(srcStr))
, fString(XMLString::replicate(srcStr, manager))
+ , fDelimeters(XMLString::replicate(fgDelimeters, manager))
, fTokens(0)
, fMemoryManager(manager)
{
try {
-
- fDelimeters = XMLString::replicate(fgDelimeters, fMemoryManager);
-
if (fStringLen > 0) {
fTokens = new (fMemoryManager) RefArrayVectorOf<XMLCh>(4, true, fMemoryManager);
}
@@ -133,12 +134,13 @@ XMLStringTokenizer::XMLStringTokenizer(const XMLCh* const srcStr,
: fOffset(0)
, fStringLen(XMLString::stringLen(srcStr))
, fString(XMLString::replicate(srcStr, manager))
+ , fDelimeters(XMLString::replicate(delim, fMemoryManager))
, fTokens(0)
, fMemoryManager(manager)
{
try {
- fDelimeters = XMLString::replicate(delim, fMemoryManager);
+
if (fStringLen > 0) {
fTokens = new (fMemoryManager) RefArrayVectorOf<XMLCh>(4, true, fMemoryManager);
diff --git a/src/xercesc/util/XMLStringTokenizer.hpp b/src/xercesc/util/XMLStringTokenizer.hpp
index 92bdeac4bc24d72e7d50af954d2268e80b4f53f7..30b2a1fa36bca131fbcad8d168517ea06f1b75f7 100644
--- a/src/xercesc/util/XMLStringTokenizer.hpp
+++ b/src/xercesc/util/XMLStringTokenizer.hpp
@@ -163,6 +163,12 @@ public:
//@}
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLStringTokenizer(const XMLStringTokenizer&);
+ XMLStringTokenizer& operator=(const XMLStringTokenizer&);
+
// -----------------------------------------------------------------------
// CleanUp methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/util/XMLUCSTranscoder.cpp b/src/xercesc/util/XMLUCSTranscoder.cpp
index 058bc5d5966d08170c8a4c4ef3ad795c36a860c4..2c2bfa9cfc0ecf4cc32d42500a4ee3f39f4b4d93 100644
--- a/src/xercesc/util/XMLUCSTranscoder.cpp
+++ b/src/xercesc/util/XMLUCSTranscoder.cpp
@@ -187,7 +187,7 @@ XMLUCS4Transcoder::transcodeTo( const XMLCh* const srcData
, XMLByte* const toFill
, const unsigned int maxBytes
, unsigned int& charsEaten
- , const UnRepOpts options)
+ , const UnRepOpts)
{
// If debugging, make sure that the block size is legal
#if defined(XERCES_DEBUG)
@@ -279,7 +279,7 @@ XMLUCS4Transcoder::transcodeTo( const XMLCh* const srcData
}
-bool XMLUCS4Transcoder::canTranscodeTo(const unsigned int toCheck) const
+bool XMLUCS4Transcoder::canTranscodeTo(const unsigned int) const
{
// We can handle anything
return true;
diff --git a/src/xercesc/util/XMLUTF16Transcoder.cpp b/src/xercesc/util/XMLUTF16Transcoder.cpp
index 86c1ad09af9246c3d6c4abf48a652532cbd588ba..722ebc528c6ea00c265bea8286ad4b872cb46ebc 100644
--- a/src/xercesc/util/XMLUTF16Transcoder.cpp
+++ b/src/xercesc/util/XMLUTF16Transcoder.cpp
@@ -168,7 +168,7 @@ XMLUTF16Transcoder::transcodeTo(const XMLCh* const srcData
, XMLByte* const toFill
, const unsigned int maxBytes
, unsigned int& charsEaten
- , const UnRepOpts options)
+ , const UnRepOpts)
{
// If debugging, make sure that the block size is legal
#if defined(XERCES_DEBUG)
@@ -236,7 +236,7 @@ XMLUTF16Transcoder::transcodeTo(const XMLCh* const srcData
}
-bool XMLUTF16Transcoder::canTranscodeTo(const unsigned int toCheck) const
+bool XMLUTF16Transcoder::canTranscodeTo(const unsigned int) const
{
// We can handle anything
return true;
diff --git a/src/xercesc/util/XMLUTF8Transcoder.cpp b/src/xercesc/util/XMLUTF8Transcoder.cpp
index 2a00ecce970e2cb5132b545e52722060de58cd0f..59b6b0e2530dba4c3aabb6e7b33b42b5ec0db507 100644
--- a/src/xercesc/util/XMLUTF8Transcoder.cpp
+++ b/src/xercesc/util/XMLUTF8Transcoder.cpp
@@ -218,7 +218,7 @@ XMLUTF8Transcoder::transcodeFrom(const XMLByte* const srcData
// first, test first byte
if((gUTFByteIndicatorTest[trailingBytes] & *srcPtr) != gUTFByteIndicator[trailingBytes]) {
char pos[2] = {(char)0x31, 0};
- char len[2] = {(char)trailingBytes+0x31, 0};
+ char len[2] = {(char)(trailingBytes+0x31), 0};
char byte[2] = {*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, pos, byte, len, getMemoryManager());
}
@@ -234,8 +234,8 @@ XMLUTF8Transcoder::transcodeFrom(const XMLByte* const srcData
}
else
{
- char len[2] = {(char)trailingBytes+0x31, 0};
- char pos[2]= {(char)i+0x31, 0};
+ char len[2] = {(char)(trailingBytes+0x31), 0};
+ char pos[2]= {(char)(i+0x31), 0};
char byte[2] = {*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, pos, byte, len, getMemoryManager());
}
@@ -246,7 +246,7 @@ XMLUTF8Transcoder::transcodeFrom(const XMLByte* const srcData
}
else
{
- char len[2] = {(char)trailingBytes+0x31, 0};
+ char len[2] = {(char)(trailingBytes+0x31), 0};
char byte[2] = {*srcPtr,0};
ThrowXMLwithMemMgr3(UTFDataFormatException, XMLExcepts::UTF8_FormatError, len, byte, len, getMemoryManager());
}
@@ -298,12 +298,12 @@ XMLUTF8Transcoder::transcodeFrom(const XMLByte* const srcData
*outPtr++ = XMLCh((tmpVal >> 10) + 0xD800);
//
- // And then the treailing char. This one accounts for no
+ // And then the trailing char. This one accounts for no
// bytes eaten from the source, so set the char size for this
// one to be zero.
//
*sizePtr++ = 0;
- *outPtr++ = XMLCh(tmpVal & 0x3FF) + 0xDC00;
+ *outPtr++ = XMLCh((tmpVal & 0x3FF) + 0xDC00);
}
}
diff --git a/src/xercesc/util/XMLUni.hpp b/src/xercesc/util/XMLUni.hpp
index 6df3a15d7809d605e33633965261c4dcb48ebc5a..7a022fc8538f9ccedd59133ed8db7c615f891d72 100644
--- a/src/xercesc/util/XMLUni.hpp
+++ b/src/xercesc/util/XMLUni.hpp
@@ -295,6 +295,12 @@ public :
// Locale
static const char fgXercescDefaultLocale[];
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XMLUni();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/regx/ClosureToken.cpp b/src/xercesc/util/regx/ClosureToken.cpp
index 04a279277aa20dcd26c8dbe201e0810eb270ee27..2100734ce5f5c625ea6b65c354b6dc2027b3b26e 100644
--- a/src/xercesc/util/regx/ClosureToken.cpp
+++ b/src/xercesc/util/regx/ClosureToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.3 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -85,9 +88,9 @@ XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
ClosureToken::ClosureToken(const unsigned short tokType, Token* const tok, MemoryManager* const manager)
: Token(tokType, manager)
- , fChild(tok)
+ , fMin(-1)
, fMax(-1)
- , fMin(-1)
+ , fChild(tok)
{
}
diff --git a/src/xercesc/util/regx/ClosureToken.hpp b/src/xercesc/util/regx/ClosureToken.hpp
index 65891a8e07a60f22e4f2f9b28f6649768d23a6e5..8c0317314064d299b3180f30782d368727b0521c 100644
--- a/src/xercesc/util/regx/ClosureToken.hpp
+++ b/src/xercesc/util/regx/ClosureToken.hpp
@@ -126,7 +126,7 @@ inline int ClosureToken::getMin() const {
return fMin;
}
-inline Token* ClosureToken::getChild(const int index) const {
+inline Token* ClosureToken::getChild(const int) const {
return fChild;
}
diff --git a/src/xercesc/util/regx/Op.cpp b/src/xercesc/util/regx/Op.cpp
index db6787f36402ff985de3246dc35f86c9a23c8f8f..5155f66b97863a242eb03979c20e362c182f811a 100644
--- a/src/xercesc/util/regx/Op.cpp
+++ b/src/xercesc/util/regx/Op.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -95,9 +98,9 @@ XERCES_CPP_NAMESPACE_BEGIN
// Op: Constructors and Destructors
// ---------------------------------------------------------------------------
Op::Op(const short type, MemoryManager* const manager)
- : fOpType(type)
- , fNextOp(0)
- , fMemoryManager(manager)
+ : fMemoryManager(manager)
+ , fOpType(type)
+ , fNextOp(0)
{
}
@@ -128,7 +131,7 @@ int Op::getRefNo() const {
return 0; // for compilers that complain about no return value
}
-const Op* Op::elementAt(int index) const {
+const Op* Op::elementAt(int) const {
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Regex_NotSupported, fMemoryManager);
return 0; // for compilers that complain about no return value
diff --git a/src/xercesc/util/regx/Op.hpp b/src/xercesc/util/regx/Op.hpp
index 9b81c933215bfa3139cc849ee7451199ec8c3156..08e444076fe6add0db987572006a81dc87489e35 100644
--- a/src/xercesc/util/regx/Op.hpp
+++ b/src/xercesc/util/regx/Op.hpp
@@ -177,6 +177,11 @@ private:
// Private data members
XMLInt32 fCharData;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ CharOp(const CharOp&);
+ CharOp& operator=(const CharOp&);
};
class XMLUTIL_EXPORT UnionOp : public Op {
@@ -202,6 +207,12 @@ public:
private:
// Private Data memebers
RefVectorOf<Op>* fBranches;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ UnionOp(const UnionOp&);
+ UnionOp& operator=(const UnionOp&);
};
@@ -226,6 +237,12 @@ public:
private:
// Private data members
const Op* fChild;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ChildOp(const ChildOp&);
+ ChildOp& operator=(const ChildOp&);
};
class XMLUTIL_EXPORT ModifierOp: public ChildOp {
@@ -246,6 +263,12 @@ private:
// Private data members
XMLInt32 fVal1;
XMLInt32 fVal2;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ModifierOp(const ModifierOp&);
+ ModifierOp& operator=(const ModifierOp&);
};
class XMLUTIL_EXPORT RangeOp: public Op {
@@ -264,6 +287,12 @@ public:
private:
// Private data members
const Token* fToken;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RangeOp(const RangeOp&);
+ RangeOp& operator=(const RangeOp&);
};
class XMLUTIL_EXPORT StringOp: public Op {
@@ -282,6 +311,12 @@ public:
private:
// Private data members
XMLCh* fLiteral;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ StringOp(const StringOp&);
+ StringOp& operator=(const StringOp&);
};
class XMLUTIL_EXPORT ConditionOp: public Op {
@@ -308,6 +343,12 @@ private:
const Op* fConditionOp;
const Op* fYesOp;
const Op* fNoOp;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ConditionOp(const ConditionOp&);
+ ConditionOp& operator=(const ConditionOp&);
};
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/regx/ParserForXMLSchema.cpp b/src/xercesc/util/regx/ParserForXMLSchema.cpp
index 5d86bcc9fddc1054d5d6bf40cb1aa0d81125c439..09767f3c5484d2299c8f50d78d8f533418ee6f9a 100644
--- a/src/xercesc/util/regx/ParserForXMLSchema.cpp
+++ b/src/xercesc/util/regx/ParserForXMLSchema.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -189,7 +192,7 @@ Token* ParserForXMLSchema::processParen() {
return retTok;
}
-RangeToken* ParserForXMLSchema::parseCharacterClass(const bool useNRange) {
+RangeToken* ParserForXMLSchema::parseCharacterClass(const bool) {
setParseContext(S_INBRACKETS);
processNext();
@@ -256,8 +259,7 @@ RangeToken* ParserForXMLSchema::parseCharacterClass(const bool useNRange) {
break;
case chLatin_p:
case chLatin_P:
- {
- int start = getOffset();
+ {
RangeToken* tok2 = processBacksolidus_pP(ch);
if (tok2 == 0) {
@@ -366,7 +368,7 @@ XMLInt32 ParserForXMLSchema::processCInCharacterClass(RangeToken* const tok,
return -1;
}
-Token* ParserForXMLSchema::processLook(const unsigned short tokType) {
+Token* ParserForXMLSchema::processLook(const unsigned short) {
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Regex_NotSupported, getMemoryManager());
return 0; // for compilers that complain about no return value
@@ -520,7 +522,7 @@ Token* ParserForXMLSchema::getTokenForShorthand(const XMLInt32 ch) {
// ---------------------------------------------------------------------------
// ParserForXMLSchema: Helper methods
// ---------------------------------------------------------------------------
-bool ParserForXMLSchema::checkQuestion(const int off) {
+bool ParserForXMLSchema::checkQuestion(const int) {
return false;
}
@@ -560,8 +562,7 @@ XMLInt32 ParserForXMLSchema::decodeEscaped() {
break;
default:
{
- XMLCh chString[] = {chBackSlash, ch, chNull};
- chString[1] = ch;
+ XMLCh chString[] = {chBackSlash, ch, chNull};
ThrowXMLwithMemMgr1(ParseException,XMLExcepts::Parser_Process2, chString, getMemoryManager());
}
}
diff --git a/src/xercesc/util/regx/RegxParser.cpp b/src/xercesc/util/regx/RegxParser.cpp
index 72b2d3c0ffb12a9de60f3e02cd4208514485db97..f2702d3d5dcf69c2d4915219bfd43184156dfce1 100644
--- a/src/xercesc/util/regx/RegxParser.cpp
+++ b/src/xercesc/util/regx/RegxParser.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -1047,8 +1050,7 @@ Token* RegxParser::parseAtom() {
return processBackReference();
case chLatin_p:
case chLatin_P:
- {
- int start = fOffset;
+ {
tok = processBacksolidus_pP(fCharData);
if (tok == 0) {
ThrowXMLwithMemMgr(ParseException,XMLExcepts::Parser_Atom5, fMemoryManager);
@@ -1115,8 +1117,8 @@ RangeToken* RegxParser::processBacksolidus_pP(const XMLInt32 ch) {
}
-XMLInt32 RegxParser::processCInCharacterClass(RangeToken* const tok,
- const XMLInt32 ch) {
+XMLInt32 RegxParser::processCInCharacterClass(RangeToken* const,
+ const XMLInt32) {
return decodeEscaped();
}
@@ -1184,8 +1186,7 @@ RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
break;
case chLatin_p:
case chLatin_P:
- {
- int pStart = fOffset;
+ {
RangeToken* tok2 = processBacksolidus_pP(ch);
if (tok2 == 0) {
diff --git a/src/xercesc/util/regx/RegxParser.hpp b/src/xercesc/util/regx/RegxParser.hpp
index 188ba0d63b5cab3c1aa55f10dc12276027b5d569..ab2bc6eca079ee1d374fb2c6399c8d66b2c20003 100644
--- a/src/xercesc/util/regx/RegxParser.hpp
+++ b/src/xercesc/util/regx/RegxParser.hpp
@@ -204,6 +204,12 @@ private:
Token* parseFactor();
Token* parseAtom();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ RegxParser(const RegxParser&);
+ RegxParser& operator=(const RegxParser&);
+
// -----------------------------------------------------------------------
// Private data types
// -----------------------------------------------------------------------
@@ -230,7 +236,7 @@ private:
int fOptions;
int fOffset;
int fNoGroups;
- int fParseContext;
+ unsigned short fParseContext;
int fStringLen;
unsigned short fState;
XMLInt32 fCharData;
diff --git a/src/xercesc/util/regx/StringToken.cpp b/src/xercesc/util/regx/StringToken.cpp
index 41fe4c306c025fd00bd139b7756541962d161891..95e5cf0c4a309545dde32774017359db82a8c209 100644
--- a/src/xercesc/util/regx/StringToken.cpp
+++ b/src/xercesc/util/regx/StringToken.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/12/17 00:18:37 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -91,8 +94,8 @@ StringToken::StringToken(const unsigned short tokType,
const int refNo,
MemoryManager* const manager)
: Token(tokType, manager)
- , fString(XMLString::replicate(literal, manager))
, fRefNo(refNo)
+ , fString(XMLString::replicate(literal, manager))
, fMemoryManager(manager)
{
diff --git a/src/xercesc/util/regx/TokenFactory.cpp b/src/xercesc/util/regx/TokenFactory.cpp
index 303d84c2ad7c0536fc8906acdc274edc2141c707..8b0065c6b74090605f2547eaa518498c2b0b826a 100644
--- a/src/xercesc/util/regx/TokenFactory.cpp
+++ b/src/xercesc/util/regx/TokenFactory.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2004/01/09 22:41:58 knoaman
* Use a global static mutex for locking when creating local static mutexes instead of compareAndSwap
*
@@ -278,8 +281,6 @@ RangeToken* TokenFactory::createRange(const bool isNegRange){
fTokens->addElement(tmpTok);
return tmpTok;
-
- return 0;
}
CharToken* TokenFactory::createChar(const XMLUInt32 ch, const bool isAnchor) {
diff --git a/src/xercesc/validators/DTD/DTDAttDef.hpp b/src/xercesc/validators/DTD/DTDAttDef.hpp
index 17c0538f8239e416f65b89dcdb12283a79d48c94..8f087238f15ef2cc45a82c03ed90e339a2751870 100644
--- a/src/xercesc/validators/DTD/DTDAttDef.hpp
+++ b/src/xercesc/validators/DTD/DTDAttDef.hpp
@@ -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 @@ public :
DECL_XSERIALIZABLE(DTDAttDef)
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDAttDef(const DTDAttDef &);
+ DTDAttDef& operator = (const DTDAttDef&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/DTD/DTDAttDefList.cpp b/src/xercesc/validators/DTD/DTDAttDefList.cpp
index f000e1925207c1fbc36fb3d07bb3502703219f72..dc7cbc7f5e35747bcad144f782a05a06b1685513 100644
--- a/src/xercesc/validators/DTD/DTDAttDefList.cpp
+++ b/src/xercesc/validators/DTD/DTDAttDefList.cpp
@@ -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 @@ bool DTDAttDefList::isEmpty() const
}
-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 @@ XMLAttDef* DTDAttDefList::findAttDef(const unsigned long uriID
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 @@ DTDAttDefList::findAttDef( const unsigned long uriID
}
-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 @@ XMLAttDef* DTDAttDefList::findAttDef( const XMLCh* const attURI
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
diff --git a/src/xercesc/validators/DTD/DTDAttDefList.hpp b/src/xercesc/validators/DTD/DTDAttDefList.hpp
index a3de3e2711bd7570b165d12f32cfc5f6ba10cbce..d17854ed1932c5a6828dc5c30d923841e8fd89c2 100644
--- a/src/xercesc/validators/DTD/DTDAttDefList.hpp
+++ b/src/xercesc/validators/DTD/DTDAttDefList.hpp
@@ -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 @@ public :
private :
void addAttDef(DTDAttDef *toAdd);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDAttDefList(const DTDAttDefList &);
+ DTDAttDefList& operator = (const DTDAttDefList&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/DTD/DTDElementDecl.cpp b/src/xercesc/validators/DTD/DTDElementDecl.cpp
index 4b0488106ed9963dd411db1dcbb3f0297dafa355..c13ebf9ad7ea912abc9fda20cab41a6f4ece7d18 100644
--- a/src/xercesc/validators/DTD/DTDElementDecl.cpp
+++ b/src/xercesc/validators/DTD/DTDElementDecl.cpp
@@ -136,9 +136,9 @@ DTDElementDecl::~DTDElementDecl()
// 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
{
diff --git a/src/xercesc/validators/DTD/DTDElementDecl.hpp b/src/xercesc/validators/DTD/DTDElementDecl.hpp
index 85a9bd629dafcd91e02c47d67b7ffcb32888667c..713fa337de16375b80dc8c80c2db340ed64ffdb4 100644
--- a/src/xercesc/validators/DTD/DTDElementDecl.hpp
+++ b/src/xercesc/validators/DTD/DTDElementDecl.hpp
@@ -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 @@ private :
XMLContentModel* makeContentModel() ;
XMLCh* formatContentModel () const ;
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDElementDecl(const DTDElementDecl &);
+ DTDElementDecl& operator = (const DTDElementDecl&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/DTD/DTDGrammar.cpp b/src/xercesc/validators/DTD/DTDGrammar.cpp
index 0980bd8527ca32d7031f7711d65a48094a3c2974..cc77383344e55ceb4006d7a0d065d822d3ce26d2 100644
--- a/src/xercesc/validators/DTD/DTDGrammar.cpp
+++ b/src/xercesc/validators/DTD/DTDGrammar.cpp
@@ -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 @@ void DTDGrammar::reinitDfltEntities() {
// -----------------------------------------------------------------------
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::findOrAddElemDecl (const unsigned int uriId
}
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
diff --git a/src/xercesc/validators/DTD/DTDGrammar.hpp b/src/xercesc/validators/DTD/DTDGrammar.hpp
index 22bfd5c81ac0d89cc29a337bf6ffcda1bfe7e686..9a05e872d065e878cddfc1ae23169dda131e5d9a 100644
--- a/src/xercesc/validators/DTD/DTDGrammar.hpp
+++ b/src/xercesc/validators/DTD/DTDGrammar.hpp
@@ -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 @@ private:
// -----------------------------------------------------------------------
void resetEntityDeclPool();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDGrammar(const DTDGrammar &);
+ DTDGrammar& operator = (const DTDGrammar&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/DTD/DTDScanner.cpp b/src/xercesc/validators/DTD/DTDScanner.cpp
index 48c6e035efcc44a4566059d68dd1071ae6d05789..3c69a9bfa3b7b65da5e73d4094df28c274836905 100644
--- a/src/xercesc/validators/DTD/DTDScanner.cpp
+++ b/src/xercesc/validators/DTD/DTDScanner.cpp
@@ -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 @@ DTDScanner::DTDScanner( DTDGrammar* dtdGrammar
, 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 @@ void DTDScanner::setScannerInfo(XMLScanner* const owningScanner
// ---------------------------------------------------------------------------
// 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 @@ bool DTDScanner::checkForPERef(const bool spaceRequired
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 @@ XMLAttDef*
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 @@ DTDScanner::scanAttDef(DTDElementDecl& parentElem, XMLBuffer& bufToUse)
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 @@ DTDScanner::scanAttDef(DTDElementDecl& parentElem, XMLBuffer& bufToUse)
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 @@ DTDScanner::scanAttDef(DTDElementDecl& parentElem, XMLBuffer& bufToUse)
}
// 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 @@ DTDScanner::scanAttDef(DTDElementDecl& parentElem, XMLBuffer& bufToUse)
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 @@ ContentSpecNode*
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 @@ DTDScanner::scanChildren(const DTDElementDecl& elemDecl, XMLBuffer& bufToUse)
);
// 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 @@ 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);
//
// Ok, the next character tells us what kind of content this particular
@@ -1418,7 +1423,7 @@ DTDScanner::scanChildren(const DTDElementDecl& elemDecl, XMLBuffer& bufToUse)
//
if (fReaderMgr->lookingAtChar(chPercent))
{
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
}
else if (fReaderMgr->skippedSpace())
{
@@ -1449,7 +1454,7 @@ DTDScanner::scanChildren(const DTDElementDecl& elemDecl, XMLBuffer& bufToUse)
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 @@ bool DTDScanner::scanContentSpec(DTDElementDecl& toFill)
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 @@ void DTDScanner::scanDefaultDecl(DTDAttDef& toFill)
// 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 @@ void DTDScanner::scanElementDecl()
// 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 @@ void DTDScanner::scanElementDecl()
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 @@ void DTDScanner::scanElementDecl()
}
// 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 @@ void DTDScanner::scanEntityDecl()
//
if (isPEDecl)
{
- if (!checkForPERef(true, false, true))
+ if (!checkForPERef(false, true))
fScanner->emitError(XMLErrs::ExpectedWhitespace);
}
@@ -2042,7 +2047,7 @@ void DTDScanner::scanEntityDecl()
// 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 @@ void DTDScanner::scanEntityDecl()
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 @@ DTDScanner::scanEntityRef(XMLCh& firstCh, XMLCh& secondCh, bool& escaped)
// 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 @@ bool DTDScanner::scanEntityDef(DTDEntityDecl& decl, const bool isPEDecl)
// 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 @@ bool DTDScanner::scanEntityDef(DTDEntityDecl& decl, const bool isPEDecl)
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 @@ bool DTDScanner::scanEntityDef(DTDEntityDecl& decl, const bool isPEDecl)
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 @@ bool DTDScanner::scanEnumeration( const DTDAttDef& attDef
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 @@ bool DTDScanner::scanEnumeration( const DTDAttDef& attDef
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 @@ bool DTDScanner::scanEnumeration( const DTDAttDef& attDef
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 @@ void DTDScanner::scanMarkupDecl(const bool parseTextDecl)
}
// 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 @@ void DTDScanner::scanMarkupDecl(const bool parseTextDecl)
// 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 @@ void DTDScanner::scanMarkupDecl(const bool parseTextDecl)
}
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 @@ bool DTDScanner::scanMixed(DTDElementDecl& toFill)
if (fReaderMgr->lookingAtChar(chPercent))
{
// Expand it and continue
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
}
else if (fReaderMgr->skippedChar(chAsterisk))
{
@@ -3501,7 +3506,7 @@ bool DTDScanner::scanMixed(DTDElementDecl& toFill)
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 @@ bool DTDScanner::scanMixed(DTDElementDecl& toFill)
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 @@ 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);
@@ -3644,7 +3649,7 @@ void DTDScanner::scanNotationDecl()
}
// 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 @@ void DTDScanner::scanNotationDecl()
}
// And one more optional space or PE ref
- checkForPERef(false, false, true);
+ checkForPERef(false, true);
// And skip the terminating bracket
if (!fReaderMgr->skippedChar(chCloseAngle))
diff --git a/src/xercesc/validators/DTD/DTDScanner.hpp b/src/xercesc/validators/DTD/DTDScanner.hpp
index fbe9f18d3a0603ca0dc7133d5e416c18b529c736..e6c99cf8dc67e4162f51b08c11b87d08404be4bc 100644
--- a/src/xercesc/validators/DTD/DTDScanner.hpp
+++ b/src/xercesc/validators/DTD/DTDScanner.hpp
@@ -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
*
@@ -189,15 +192,19 @@ public:
);
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 @@ private:
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
diff --git a/src/xercesc/validators/DTD/DTDValidator.cpp b/src/xercesc/validators/DTD/DTDValidator.cpp
index 9f0569634156825797b062e64a9a8ec025860f8d..3dd77f87faaf80a97606e6e3d1693ab22d3a55c6 100644
--- a/src/xercesc/validators/DTD/DTDValidator.cpp
+++ b/src/xercesc/validators/DTD/DTDValidator.cpp
@@ -203,7 +203,7 @@ void
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 @@ DTDValidator::validateAttrValue(const XMLAttDef* attDef
|| (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 @@ DTDValidator::validateAttrValue(const XMLAttDef* attDef
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 @@ DTDValidator::validateAttrValue(const XMLAttDef* attDef
}
-void DTDValidator::preContentValidation(bool reuseGrammar,
+void DTDValidator::preContentValidation(bool,
bool validateDefAttr)
{
//
diff --git a/src/xercesc/validators/DTD/DTDValidator.hpp b/src/xercesc/validators/DTD/DTDValidator.hpp
index c976892bc8e2953b5432d014d7296400eab491a6..379c62b6d0e3b164e64716fe442372a8802ed951 100644
--- a/src/xercesc/validators/DTD/DTDValidator.hpp
+++ b/src/xercesc/validators/DTD/DTDValidator.hpp
@@ -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 @@ public:
virtual bool handlesSchema() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DTDValidator(const DTDValidator &);
+ DTDValidator& operator = (const DTDValidator&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/common/AllContentModel.cpp b/src/xercesc/validators/common/AllContentModel.cpp
index 980e8a446b2df8becc038aeb2aef7ddc87a92205..3fe2c75ba9664c9677cca0f938cc5420f3930eb2 100644
--- a/src/xercesc/validators/common/AllContentModel.cpp
+++ b/src/xercesc/validators/common/AllContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -171,7 +174,7 @@ AllContentModel::~AllContentModel()
int
AllContentModel::validateContent( QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId) const
+ , const unsigned int) const
{
// If <all> had minOccurs of zero and there are
// no children to validate, trivially validate
@@ -243,7 +246,7 @@ AllContentModel::validateContent( QName** const children
int AllContentModel::validateContentSpecial(QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId
+ , const unsigned int
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool) const
{
diff --git a/src/xercesc/validators/common/AllContentModel.hpp b/src/xercesc/validators/common/AllContentModel.hpp
index 09d72d4b33aece3e1882bb5802bc1ed5490313b1..9ccbb175828adc2e9d204d32d80d0e12dc64f7fa 100644
--- a/src/xercesc/validators/common/AllContentModel.hpp
+++ b/src/xercesc/validators/common/AllContentModel.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.5 2003/05/16 21:43:20 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -202,8 +205,8 @@ inline ContentLeafNameTypeVector* AllContentModel::getContentLeafNameTypeVector(
}
inline unsigned int
-AllContentModel::getNextState(const unsigned int currentState,
- const unsigned int elementIndex) const {
+AllContentModel::getNextState(const unsigned int,
+ const unsigned int) const {
return XMLContentModel::gInvalidTrans;
}
diff --git a/src/xercesc/validators/common/CMAny.hpp b/src/xercesc/validators/common/CMAny.hpp
index c3a95169a09310df5955737e47d19579120706ae..e62c6185ab70a0e2bf0fa16055bc728a7dc48b03 100644
--- a/src/xercesc/validators/common/CMAny.hpp
+++ b/src/xercesc/validators/common/CMAny.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/05/16 21:43:20 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -142,6 +145,12 @@ private :
// -----------------------------------------------------------------------
unsigned int fURI;
unsigned int fPosition;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ CMAny(const CMAny&);
+ CMAny& operator=(const CMAny&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/CMBinaryOp.hpp b/src/xercesc/validators/common/CMBinaryOp.hpp
index bd82339055b09805fa43f55ea71792f2462bc7e2..07dc09c6671da0b9acc142e6f532203b4e41a661 100644
--- a/src/xercesc/validators/common/CMBinaryOp.hpp
+++ b/src/xercesc/validators/common/CMBinaryOp.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/05/16 21:43:20 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -157,6 +160,12 @@ private :
// -----------------------------------------------------------------------
CMNode* fLeftChild;
CMNode* fRightChild;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ CMBinaryOp(const CMBinaryOp&);
+ CMBinaryOp& operator=(const CMBinaryOp&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/CMLeaf.hpp b/src/xercesc/validators/common/CMLeaf.hpp
index 6b91b80f7da1117d9984314033c646cef764ead3..9e595baa1ab7ed4989a3c41402d7f59ac4cfc7ae 100644
--- a/src/xercesc/validators/common/CMLeaf.hpp
+++ b/src/xercesc/validators/common/CMLeaf.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/05/30 16:11:45 gareth
* Fixes so we compile under VC7.1. Patch by Alberto Massari.
*
@@ -204,6 +207,12 @@ private :
QName* fElement;
unsigned int fPosition;
bool fAdopt;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ CMLeaf(const CMLeaf&);
+ CMLeaf& operator=(const CMLeaf&);
};
diff --git a/src/xercesc/validators/common/CMUnaryOp.hpp b/src/xercesc/validators/common/CMUnaryOp.hpp
index c8f83a3f3697924819125ab8f1762c675a0c5343..104d8c0fa78699879ba040ccbc03d9fa3a740b99 100644
--- a/src/xercesc/validators/common/CMUnaryOp.hpp
+++ b/src/xercesc/validators/common/CMUnaryOp.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.4 2003/05/16 21:43:20 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -154,6 +157,12 @@ private :
// unary operation. We own it.
// -----------------------------------------------------------------------
CMNode* fChild;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ CMUnaryOp(const CMUnaryOp&);
+ CMUnaryOp& operator=(const CMUnaryOp&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/ContentSpecNode.hpp b/src/xercesc/validators/common/ContentSpecNode.hpp
index 9befe8ef24eddc44bde12cdbe2999beeb3b1ce58..b83b45c3c873a9a5b5796a2c3f00c46fc9ae47d7 100644
--- a/src/xercesc/validators/common/ContentSpecNode.hpp
+++ b/src/xercesc/validators/common/ContentSpecNode.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/11/20 17:52:14 knoaman
* PSVI: store element declaration (leaf nodes)
*
@@ -298,7 +301,7 @@ private :
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
-
+ ContentSpecNode& operator=(const ContentSpecNode&);
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/common/DFAContentModel.cpp b/src/xercesc/validators/common/DFAContentModel.cpp
index a5a25a027fdcf0c720717bfffddde14b35fb15ef..c356b721cdc1e77e1a258578addc722c8b47a298 100644
--- a/src/xercesc/validators/common/DFAContentModel.cpp
+++ b/src/xercesc/validators/common/DFAContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -254,6 +257,7 @@ DFAContentModel::DFAContentModel( const bool dtd
, fHeadNode(0)
, fLeafCount(0)
, fLeafList(0)
+ , fLeafListType(0)
, fTransTable(0)
, fTransTableSize(0)
, fDTD(dtd)
@@ -280,6 +284,7 @@ DFAContentModel::DFAContentModel( const bool dtd
, fHeadNode(0)
, fLeafCount(0)
, fLeafList(0)
+ , fLeafListType(0)
, fTransTable(0)
, fTransTableSize(0)
, fDTD(dtd)
@@ -321,7 +326,7 @@ DFAContentModel::~DFAContentModel()
int
DFAContentModel::validateContent( QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId) const
+ , const unsigned int) const
{
//
// If there are no children, then either we fail on the 0th element
@@ -431,7 +436,7 @@ DFAContentModel::validateContent( QName** const children
int DFAContentModel::validateContentSpecial(QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId
+ , const unsigned int
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool) const
{
@@ -726,8 +731,7 @@ void DFAContentModel::buildDFA(ContentSpecNode* const curNode)
for (unsigned int leafIndex = 0; leafIndex < fLeafCount; leafIndex++)
{
- const QName* leaf = fLeafList[leafIndex]->getElement();
- const int leafType = fLeafListType[leafIndex];
+ const QName* leaf = fLeafList[leafIndex]->getElement();
if (fDTD) {
if (XMLString::equals(leaf->getRawName(), elementRawName)) {
fLeafSorter[fSortCount++] = leafIndex;
@@ -1304,7 +1308,7 @@ ContentLeafNameTypeVector* DFAContentModel::getContentLeafNameTypeVector() const
{
//later change it to return the data member
return fLeafNameTypeVector;
-};
+}
void DFAContentModel::checkUniqueParticleAttribution (SchemaGrammar* const pGrammar,
GrammarResolver* const pGrammarResolver,
diff --git a/src/xercesc/validators/common/Grammar.cpp b/src/xercesc/validators/common/Grammar.cpp
index b3c4653a78971c4a6afae2b192dd0ee11b4802e3..31942279884d482f33c47747c0924b0b416d1fd2 100644
--- a/src/xercesc/validators/common/Grammar.cpp
+++ b/src/xercesc/validators/common/Grammar.cpp
@@ -58,6 +58,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.3 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.2 2003/10/29 16:19:47 peiyongz
* storeGrammar()/loadGrammar added
*
@@ -83,7 +86,7 @@ XERCES_CPP_NAMESPACE_BEGIN
IMPL_XSERIALIZABLE_NOCREATE(Grammar)
-void Grammar::serialize(XSerializeEngine& serEng)
+void Grammar::serialize(XSerializeEngine&)
{
//no data
}
@@ -115,18 +118,14 @@ Grammar* Grammar::loadGrammar(XSerializeEngine& serEng)
DTDGrammar* dtdGrammar;
serEng>>dtdGrammar;
return dtdGrammar;
- break;
case SchemaGrammarType:
SchemaGrammar* schemaGrammar;
serEng>>schemaGrammar;
- return schemaGrammar;
- break;
+ return schemaGrammar;
case UnKnown:
- return 0;
- break;
+ return 0;
default: //we treat this same as UnKnown
- return 0;
- break;
+ return 0;
}
}
diff --git a/src/xercesc/validators/common/Grammar.hpp b/src/xercesc/validators/common/Grammar.hpp
index 171add8f27233b5128412a1021e8c4a7a73eaf70..18be0ccb6a53cc6fa898f44fd2a54de5e8db5b92 100644
--- a/src/xercesc/validators/common/Grammar.hpp
+++ b/src/xercesc/validators/common/Grammar.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/10/29 16:19:47 peiyongz
* storeGrammar()/loadGrammar added
*
@@ -273,6 +276,12 @@ protected :
// -----------------------------------------------------------------------
Grammar(){};
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ Grammar(const Grammar&);
+ Grammar& operator=(const Grammar&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/common/GrammarResolver.hpp b/src/xercesc/validators/common/GrammarResolver.hpp
index 2bf76be14a76d536c2ec6c539088b932304c563c..1bd809b86bf9ed674eb688103dbe046138fe376a 100644
--- a/src/xercesc/validators/common/GrammarResolver.hpp
+++ b/src/xercesc/validators/common/GrammarResolver.hpp
@@ -230,6 +230,11 @@ public:
//@}
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ GrammarResolver(const GrammarResolver&);
+ GrammarResolver& operator=(const GrammarResolver&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/common/MixedContentModel.cpp b/src/xercesc/validators/common/MixedContentModel.cpp
index 4d6ba75ad6fccaab035c5d141eb42947caede52b..ddac204cd1a7651d0a5fa1124a742456c4603163 100644
--- a/src/xercesc/validators/common/MixedContentModel.cpp
+++ b/src/xercesc/validators/common/MixedContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -265,7 +268,7 @@ bool MixedContentModel::hasDups() const
int
MixedContentModel::validateContent( QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId) const
+ , const unsigned int) const
{
// must match order
if (fOrdered) {
@@ -372,7 +375,7 @@ MixedContentModel::validateContent( QName** const children
int MixedContentModel::validateContentSpecial(QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId
+ , const unsigned int
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool) const
{
diff --git a/src/xercesc/validators/common/MixedContentModel.hpp b/src/xercesc/validators/common/MixedContentModel.hpp
index dc7f82839ec30d89cebc9e213ada96fe1683d05f..d86cb719ccbfaebfbb02b8bf8009cf01f6a6f15e 100644
--- a/src/xercesc/validators/common/MixedContentModel.hpp
+++ b/src/xercesc/validators/common/MixedContentModel.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/05/16 21:43:20 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -259,18 +262,18 @@ inline ContentLeafNameTypeVector* MixedContentModel::getContentLeafNameTypeVecto
}
inline unsigned int
-MixedContentModel::getNextState(const unsigned int currentState,
- const unsigned int elementIndex) const {
+MixedContentModel::getNextState(const unsigned int,
+ const unsigned int) const {
return XMLContentModel::gInvalidTrans;
}
inline void MixedContentModel::checkUniqueParticleAttribution
(
- SchemaGrammar* const pGrammar
- , GrammarResolver* const pGrammarResolver
- , XMLStringPool* const pStringPool
- , XMLValidator* const pValidator
+ SchemaGrammar* const
+ , GrammarResolver* const
+ , XMLStringPool* const
+ , XMLValidator* const
, unsigned int* const pContentSpecOrgURI
)
{
diff --git a/src/xercesc/validators/common/SimpleContentModel.cpp b/src/xercesc/validators/common/SimpleContentModel.cpp
index 976d47e5d61a0d3fdd5f923ae73c3243bb4598d0..e437451eeed940487178959101ed390a9ed45e9c 100644
--- a/src/xercesc/validators/common/SimpleContentModel.cpp
+++ b/src/xercesc/validators/common/SimpleContentModel.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -155,7 +158,7 @@ XERCES_CPP_NAMESPACE_BEGIN
int
SimpleContentModel::validateContent(QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId) const
+ , const unsigned int) const
{
//
// According to the type of operation, we do the correct type of
@@ -342,7 +345,7 @@ SimpleContentModel::validateContent(QName** const children
int SimpleContentModel::validateContentSpecial(QName** const children
, const unsigned int childCount
- , const unsigned int emptyNamespaceId
+ , const unsigned int
, GrammarResolver* const pGrammarResolver
, XMLStringPool* const pStringPool) const
{
diff --git a/src/xercesc/validators/common/SimpleContentModel.hpp b/src/xercesc/validators/common/SimpleContentModel.hpp
index 0811c5b839ad2bd1500fe2823e907ce4dbcb7be2..9aad6bf5687d7216cacb7af30df4b4950d71ef4c 100644
--- a/src/xercesc/validators/common/SimpleContentModel.hpp
+++ b/src/xercesc/validators/common/SimpleContentModel.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2004/01/29 11:51:21 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -290,8 +293,8 @@ inline SimpleContentModel::~SimpleContentModel()
// SimpleContentModel: Virtual methods
// ---------------------------------------------------------------------------
inline unsigned int
-SimpleContentModel::getNextState(const unsigned int currentState,
- const unsigned int elementIndex) const {
+SimpleContentModel::getNextState(const unsigned int,
+ const unsigned int) const {
return XMLContentModel::gInvalidTrans;
}
diff --git a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
index d1653934aa32d6f7c2d316e02ec76bb242d91081..f01f04935828fefbb5515c6a980efceb12a9c51c 100644
--- a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.18 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.17 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -913,12 +916,12 @@ const RefArrayVectorOf<XMLCh>* AbstractNumericFacetValidator::getEnumString() co
}
-void AbstractNumericFacetValidator::checkAdditionalFacetConstraints(MemoryManager* const manager) const
+void AbstractNumericFacetValidator::checkAdditionalFacetConstraints(MemoryManager* const) const
{
return;
}
-void AbstractNumericFacetValidator::checkAdditionalFacetConstraintsBase(MemoryManager* const manager) const
+void AbstractNumericFacetValidator::checkAdditionalFacetConstraintsBase(MemoryManager* const) const
{
return;
}
diff --git a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
index 21d244f25a4abc6512f7e8b3c3cde0900d5ea315..85532ad9a15497f6864814fd44aab31423166bd5 100644
--- a/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
+++ b/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.11 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -226,6 +229,11 @@ private:
void inheritFacet();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ AbstractNumericFacetValidator(const AbstractNumericFacetValidator&);
+ AbstractNumericFacetValidator& operator=(const AbstractNumericFacetValidator&);
};
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/datatype/AbstractNumericValidator.hpp b/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
index 375dbab312fe3e470b73962a195010d19f16e59a..c196ccfd11bd11ae50921e5ed7cd83e9839df673 100644
--- a/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
+++ b/src/xercesc/validators/datatype/AbstractNumericValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.10 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -162,10 +165,10 @@ protected:
private:
// -----------------------------------------------------------------------
- // Private data members
- //
+ // Unimplemented constructors and operators
// -----------------------------------------------------------------------
-
+ AbstractNumericValidator(const AbstractNumericValidator&);
+ AbstractNumericValidator& operator=(const AbstractNumericValidator&);
};
inline void AbstractNumericValidator::init(RefArrayVectorOf<XMLCh>* const enums
diff --git a/src/xercesc/validators/datatype/AbstractStringValidator.cpp b/src/xercesc/validators/datatype/AbstractStringValidator.cpp
index 60016e572521560a8d9362df5e8f442940ba7735..13c7ab7d9d4d16243b01598f88903eeb9bba82da 100644
--- a/src/xercesc/validators/datatype/AbstractStringValidator.cpp
+++ b/src/xercesc/validators/datatype/AbstractStringValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.22 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.21 2004/01/13 21:18:18 peiyongz
* revert code back to previous version
*
@@ -670,7 +673,7 @@ void AbstractStringValidator::inheritFacet()
// -----------------------------------------------------------------------
int AbstractStringValidator::compare(const XMLCh* const lValue
, const XMLCh* const rValue
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
return XMLString::compareString(lValue, rValue);
}
@@ -787,26 +790,26 @@ const RefArrayVectorOf<XMLCh>* AbstractStringValidator::getEnumString() const
return getEnumeration();
}
-void AbstractStringValidator::normalizeEnumeration(MemoryManager* const manager)
+void AbstractStringValidator::normalizeEnumeration(MemoryManager* const)
{
// default implementation: do nothing
return;
}
-void AbstractStringValidator::normalizeContent(XMLCh* const, MemoryManager* const manager) const
+void AbstractStringValidator::normalizeContent(XMLCh* const, MemoryManager* const) const
{
// default implementation: do nothing
return;
}
-void AbstractStringValidator::checkAdditionalFacetConstraints(MemoryManager* const manager) const
+void AbstractStringValidator::checkAdditionalFacetConstraints(MemoryManager* const) const
{
return;
}
-void AbstractStringValidator::checkAdditionalFacet(const XMLCh* const content
- , MemoryManager* const manager) const
+void AbstractStringValidator::checkAdditionalFacet(const XMLCh* const
+ , MemoryManager* const) const
{
return;
}
@@ -827,7 +830,7 @@ void AbstractStringValidator::assignAdditionalFacet( const XMLCh* const key
}
int AbstractStringValidator::getLength(const XMLCh* const content
- , MemoryManager* const manager) const
+ , MemoryManager* const) const
{
return XMLString::stringLen(content);
}
diff --git a/src/xercesc/validators/datatype/AbstractStringValidator.hpp b/src/xercesc/validators/datatype/AbstractStringValidator.hpp
index c3085f52e7558b9c6cbbba3fdb03767ee1de0324..8f6f700124cd476bd9123b379a2ec62a2c0ce6f7 100644
--- a/src/xercesc/validators/datatype/AbstractStringValidator.hpp
+++ b/src/xercesc/validators/datatype/AbstractStringValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.12 2003/12/31 10:38:00 amassari
* Made virtual function checkAdditionalFacet 'const', so that it matches the declaration in a derived class
*
@@ -280,6 +283,12 @@ private:
void inspectFacet(MemoryManager* const manager);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ AbstractStringValidator(const AbstractStringValidator&);
+ AbstractStringValidator& operator=(const AbstractStringValidator&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
index d83764ad0211b9b13329a97b28c6e396305f2aef..d5a6cc484c5b3e4cde75bbe59d8d4a707d08a6f0 100644
--- a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -123,7 +126,7 @@ DatatypeValidator* AnySimpleTypeDatatypeValidator::newInstance
(
RefHashTableOf<KVStringPair>* const facets
, RefArrayVectorOf<XMLCh>* const enums
- , const int finalSet
+ , const int
, MemoryManager* const manager
)
{
diff --git a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
index 3759c2a27c54fcc29e9d1a3f65fcda3e7c9bb089..f97f19ebeffb1e7dfecf2f7bbe898330ac55a512 100644
--- a/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
@@ -175,6 +175,12 @@ public:
***/
DECL_XSERIALIZABLE(AnySimpleTypeDatatypeValidator)
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ AnySimpleTypeDatatypeValidator(const AnySimpleTypeDatatypeValidator&);
+ AnySimpleTypeDatatypeValidator& operator=(const AnySimpleTypeDatatypeValidator&);
};
@@ -190,9 +196,9 @@ inline bool AnySimpleTypeDatatypeValidator::isAtomic() const {
// ---------------------------------------------------------------------------
// DatatypeValidators: Compare methods
// ---------------------------------------------------------------------------
-inline int AnySimpleTypeDatatypeValidator::compare(const XMLCh* const lValue,
- const XMLCh* const rValue
- , MemoryManager* const manager)
+inline int AnySimpleTypeDatatypeValidator::compare(const XMLCh* const,
+ const XMLCh* const
+ , MemoryManager* const)
{
return -1;
}
@@ -201,15 +207,15 @@ inline int AnySimpleTypeDatatypeValidator::compare(const XMLCh* const lValue,
// DatatypeValidators: Validation methods
// ---------------------------------------------------------------------------
inline bool
-AnySimpleTypeDatatypeValidator::isSubstitutableBy(const DatatypeValidator* const toCheck)
+AnySimpleTypeDatatypeValidator::isSubstitutableBy(const DatatypeValidator* const)
{
return true;
}
inline void
-AnySimpleTypeDatatypeValidator::validate(const XMLCh* const content
- , ValidationContext* const context
- , MemoryManager* const manager)
+AnySimpleTypeDatatypeValidator::validate(const XMLCh* const
+ , ValidationContext* const
+ , MemoryManager* const)
{
return;
}
diff --git a/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp b/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
index c8993b1c954cae73f016c3d9e375b51be89bba8d..192700358a4f04a5ffe25d028ed71cf632a9c8d9 100644
--- a/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/AnyURIDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.7 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -161,7 +164,12 @@ protected:
virtual void checkValueSpace(const XMLCh* const content
, MemoryManager* const manager);
-private:
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ AnyURIDatatypeValidator(const AnyURIDatatypeValidator&);
+ AnyURIDatatypeValidator& operator=(const AnyURIDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp b/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
index bb35cfeaafd1f37514b1784ae40bfd18da3e92fe..abe403dc0a11ce7347a10862878eaa5f0128a4f6 100644
--- a/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/Base64BinaryDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.9 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -154,10 +157,10 @@ protected:
private:
// -----------------------------------------------------------------------
- // Private data members
- //
- // Nil
+ // Unimplemented constructors and operators
// -----------------------------------------------------------------------
+ Base64BinaryDatatypeValidator(const Base64BinaryDatatypeValidator&);
+ Base64BinaryDatatypeValidator& operator=(const Base64BinaryDatatypeValidator&);
};
diff --git a/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp b/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
index d7c1bab8ac6bcc959c05b5d178d5f76ae22e5418..1afb437040557320c2075bcc54926da02390d080 100644
--- a/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.15 2004/01/13 20:57:06 peiyongz
* revert code back to previous version
*
@@ -249,7 +252,7 @@ void BooleanDatatypeValidator::checkContent( const XMLCh* const cont
int BooleanDatatypeValidator::compare(const XMLCh* const lValue
, const XMLCh* const rValue
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
// need to check by bool semantics
// 1 == true
diff --git a/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp b/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
index 76fd3606024e1dab45d55885010786d5e76e6a65..9c4a8baaa1c0f27961a53b411f128e9dce674601 100644
--- a/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
@@ -175,9 +175,10 @@ private:
, MemoryManager* const manager);
// -----------------------------------------------------------------------
- // Private data members
- //
+ // Unimplemented methods.
// -----------------------------------------------------------------------
+ BooleanDatatypeValidator(const BooleanDatatypeValidator&);
+ BooleanDatatypeValidator& operator=(const BooleanDatatypeValidator&);
};
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.cpp b/src/xercesc/validators/datatype/DatatypeValidator.cpp
index ba66cc536b52b177e8d2c436e2e6e020644e5cd9..f75d3fdb216519c43affadafb51ed11c95b9d399 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.20 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -204,8 +207,8 @@ DatatypeValidator::DatatypeValidator(DatatypeValidator* const baseValidator,
, fFacets(facets)
, fPattern(0)
, fRegex(0)
- , fTypeLocalName(XMLUni::fgZeroLenString)
, fTypeName(0)
+ , fTypeLocalName(XMLUni::fgZeroLenString)
, fTypeUri(XMLUni::fgZeroLenString)
, fOrdered(XSSimpleTypeDefinition::ORDERED_FALSE)
, fFinite(false)
@@ -489,144 +492,115 @@ DatatypeValidator* DatatypeValidator::loadDV(XSerializeEngine& serEng)
case String:
StringDatatypeValidator* stringdv;
serEng>>stringdv;
- return stringdv;
- break;
+ return stringdv;
case AnyURI:
AnyURIDatatypeValidator* anyuridv;
serEng>>anyuridv;
- return anyuridv;
- break;
+ return anyuridv;
case QName:
QNameDatatypeValidator* qnamedv;
serEng>>qnamedv;
- return qnamedv;
- break;
+ return qnamedv;
case Name:
NameDatatypeValidator* namedv;
serEng>>namedv;
- return namedv;
- break;
+ return namedv;
case NCName:
NCNameDatatypeValidator* ncnamedv;
serEng>>ncnamedv;
- return ncnamedv;
- break;
+ return ncnamedv;
case Boolean:
BooleanDatatypeValidator* booleandv;
serEng>>booleandv;
- return booleandv;
- break;
+ return booleandv;
case Float:
FloatDatatypeValidator* floatdv;
serEng>>floatdv;
- return floatdv;
- break;
+ return floatdv;
case Double:
DoubleDatatypeValidator* doubledv;
serEng>>doubledv;
- return doubledv;
- break;
+ return doubledv;
case Decimal:
DecimalDatatypeValidator* decimaldv;
serEng>>decimaldv;
- return decimaldv;
- break;
+ return decimaldv;
case HexBinary:
HexBinaryDatatypeValidator* hexbinarydv;
serEng>>hexbinarydv;
- return hexbinarydv;
- break;
+ return hexbinarydv;
case Base64Binary:
Base64BinaryDatatypeValidator* base64binarydv;
serEng>>base64binarydv;
- return base64binarydv;
- break;
+ return base64binarydv;
case Duration:
DurationDatatypeValidator* durationdv;
serEng>>durationdv;
return durationdv;
- break;
case DateTime:
DateTimeDatatypeValidator* datetimedv;
serEng>>datetimedv;
- return datetimedv;
- break;
+ return datetimedv;
case Date:
DateDatatypeValidator* datedv;
serEng>>datedv;
return datedv;
- break;
case Time:
TimeDatatypeValidator* timedv;
serEng>>timedv;
return timedv;
- break;
case MonthDay:
MonthDayDatatypeValidator* monthdaydv;
serEng>>monthdaydv;
return monthdaydv;
- break;
case YearMonth:
YearMonthDatatypeValidator* yearmonthdv;
serEng>>yearmonthdv;
return yearmonthdv;
- break;
case Year:
YearDatatypeValidator* yeardv;
serEng>>yeardv;
return yeardv;
- break;
case Month:
MonthDatatypeValidator* monthdv;
serEng>>monthdv;
return monthdv;
- break;
case Day:
DayDatatypeValidator* daydv;
serEng>>daydv;
return daydv;
- break;
case ID:
IDDatatypeValidator* iddv;
serEng>>iddv;
return iddv;
- break;
case IDREF:
IDREFDatatypeValidator* idrefdv;
serEng>>idrefdv;
return idrefdv;
- break;
case ENTITY:
ENTITYDatatypeValidator* entitydv;
serEng>>entitydv;
return entitydv;
- break;
case NOTATION:
NOTATIONDatatypeValidator* notationdv;
serEng>>notationdv;
return notationdv;
- break;
case List:
ListDatatypeValidator* listdv;
serEng>>listdv;
return listdv;
- break;
case Union:
UnionDatatypeValidator* uniondv;
serEng>>uniondv;
return uniondv;
- break;
case AnySimpleType:
AnySimpleTypeDatatypeValidator* anysimpletypedv;
serEng>>anysimpletypedv;
return anysimpletypedv;
- break;
case UnKnown:
return 0;
- break;
default: //we treat this same as UnKnown
return 0;
- break;
}
}
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.hpp b/src/xercesc/validators/datatype/DatatypeValidator.hpp
index 41eaea9bdf0ff020af1ee6f284cbd5920fdf2cd1..06d4e4ba7863153d366e03e972d4ad4ee383af84 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.hpp
@@ -516,6 +516,12 @@ private:
inline bool isBuiltInDV(DatatypeValidator* const);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DatatypeValidator(const DatatypeValidator&);
+ DatatypeValidator& operator=(const DatatypeValidator&);
+
// -----------------------------------------------------------------------
// Private data members
//
@@ -742,7 +748,7 @@ inline void DatatypeValidator::setNumeric(bool numeric)
// ---------------------------------------------------------------------------
inline int DatatypeValidator::compare(const XMLCh* const lValue,
const XMLCh* const rValue
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
return XMLString::compareString(lValue, rValue);
}
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
index 8d50bbad57edad70e56e93fa52dbc8204ebe44af..e40058bfc76dcbad3f385c59596b7638ab9d3b11 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
@@ -263,6 +263,12 @@ private:
// -----------------------------------------------------------------------
void cleanUp();
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DatatypeValidatorFactory(const DatatypeValidatorFactory&);
+ DatatypeValidatorFactory& operator=(const DatatypeValidatorFactory&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/datatype/DateDatatypeValidator.hpp b/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
index 74467306d5e9b39eb7355856596a84bab4810a3d..5688f2f5dd6e4335388d52b52c99c5a11709082e 100644
--- a/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DateDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -140,6 +143,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DateDatatypeValidator(const DateDatatypeValidator&);
+ DateDatatypeValidator& operator=(const DateDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp b/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
index b44578c5ab2864f2c0ee054133c509fb1663db08..ecad305eff5c32ee6169f5d262502688c9acc1d7 100644
--- a/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DateTimeDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.10 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -154,6 +157,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DateTimeDatatypeValidator(const DateTimeDatatypeValidator&);
+ DateTimeDatatypeValidator& operator=(const DateTimeDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/DateTimeValidator.cpp b/src/xercesc/validators/datatype/DateTimeValidator.cpp
index 5f279b959e25a47fe6c628b610e933b58e699b10..e2316382bf6691afe7e2011af5674b987e89594a 100644
--- a/src/xercesc/validators/datatype/DateTimeValidator.cpp
+++ b/src/xercesc/validators/datatype/DateTimeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.17 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.16 2004/01/13 21:18:18 peiyongz
* revert code back to previous version
*
@@ -320,7 +323,7 @@ int DateTimeValidator::compareValues(const XMLNumber* const lValue
*/
int DateTimeValidator::compareDates(const XMLDateTime* const date1
, const XMLDateTime* const date2
- , bool strict)
+ , bool)
{
return XMLDateTime::compare(date1, date2);
}
@@ -361,7 +364,7 @@ void DateTimeValidator::setMinExclusive(const XMLCh* const value)
fMinExclusive = parse(value, fMemoryManager);
}
-void DateTimeValidator::setEnumeration(MemoryManager* const manager)
+void DateTimeValidator::setEnumeration(MemoryManager* const)
{
// to do: do we need to check against base value space???
diff --git a/src/xercesc/validators/datatype/DateTimeValidator.hpp b/src/xercesc/validators/datatype/DateTimeValidator.hpp
index ac53152a825f52e3bb501b780bf51189ab30104c..3e16a4b00c89771fe15e7d86ff95ca83cf8e2952 100644
--- a/src/xercesc/validators/datatype/DateTimeValidator.hpp
+++ b/src/xercesc/validators/datatype/DateTimeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.9 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -175,9 +178,14 @@ protected:
// to be overwritten by duration
virtual int compareDates(const XMLDateTime* const lValue
, const XMLDateTime* const rValue
- , bool strict);
+ , bool strict);
- XMLDateTime* fDateTime; //made available to derivatives
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DateTimeValidator(const DateTimeValidator&);
+ DateTimeValidator& operator=(const DateTimeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/DayDatatypeValidator.hpp b/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
index a7cea84a92121598b1042229fe99fa4654a1a943..4449fed00cbd3964fdb3d94545a1037908bfda52 100644
--- a/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DayDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -140,6 +143,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DayDatatypeValidator(const DayDatatypeValidator&);
+ DayDatatypeValidator& operator=(const DayDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp b/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
index 9cd7a2c8b082713a77542a64ca1f4068bb30accd..23ff074c453c7c684abd47db6bcb393b7c936b5f 100644
--- a/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DecimalDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.14 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.13 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -262,6 +265,12 @@ private:
unsigned int fTotalDigits;
unsigned int fFractionDigits;
+
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DecimalDatatypeValidator(const DecimalDatatypeValidator&);
+ DecimalDatatypeValidator& operator=(const DecimalDatatypeValidator&);
};
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp b/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
index 4a62a200db010c9b901d247ff1359b3b983aaddc..9c5f2b96be268cd45dd241c3dc80e076b25c5f18 100644
--- a/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DoubleDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -207,7 +210,12 @@ protected:
, ValidationContext* const context
, bool asBase
, MemoryManager* const manager);
-
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DoubleDatatypeValidator(const DoubleDatatypeValidator &);
+ DoubleDatatypeValidator& operator = (const DoubleDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp b/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
index ba7890c005b24adf87c34d41cf927298f53e62f5..96137a5deea340a65eae592e0fad7d9f2ac98df8 100644
--- a/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DurationDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.11 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.10 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -171,7 +174,7 @@ void DurationDatatypeValidator::parse(XMLDateTime* const pDate)
int DurationDatatypeValidator::compareDates(const XMLDateTime* const date1
, const XMLDateTime* const date2
- , bool strict)
+ , bool strict)
{
return XMLDateTime::compare(date1, date2, strict);
}
diff --git a/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp b/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
index 0f84d36f54a39de3a31aefc1d016f8aa9ce4ed5d..16ec821808ad09701e7a1ec0f653b90789659964 100644
--- a/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DurationDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -143,6 +146,12 @@ protected:
virtual int compareDates(const XMLDateTime* const
, const XMLDateTime* const
, bool );
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ DurationDatatypeValidator(const DurationDatatypeValidator &);
+ DurationDatatypeValidator& operator = (const DurationDatatypeValidator&);
};
diff --git a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
index 8c349d66de7c67166e5512b71335c95b7a324345..657fe7e35dc8b8ed45e90993e2dd61e093d9a1ea 100644
--- a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.10 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/17 00:18:38 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -153,7 +156,7 @@ DatatypeValidator* ENTITYDatatypeValidator::newInstance
// -----------------------------------------------------------------------
int ENTITYDatatypeValidator::compare(const XMLCh* const lValue
, const XMLCh* const rValue
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
return ( XMLString::equals(lValue, rValue)? 0 : -1);
}
diff --git a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
index b962af32416f88dd9f13fbb763e27a1d4ac916c9..544a9f7a23edb389a3a2eb67cc8c2e9aee830d3a 100644
--- a/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -221,12 +224,11 @@ protected:
, MemoryManager* const manager);
private:
-
// -----------------------------------------------------------------------
- // Private data members
- //
- //
+ // Unimplemented constructors and operators
// -----------------------------------------------------------------------
+ ENTITYDatatypeValidator(const ENTITYDatatypeValidator&);
+ ENTITYDatatypeValidator& operator = (const ENTITYDatatypeValidator&);
};
diff --git a/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp b/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
index fa7378c33c1ac0936d3b9c5097d97bcc11e65a8c..a5c89ef86aab121208c77fbfe0c5f1ff0d7d9b76 100644
--- a/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/FloatDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.9 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/19 23:02:25 cargilld
* More memory management updates.
*
@@ -210,6 +213,12 @@ protected:
, ValidationContext* const context
, bool asBase
, MemoryManager* const manager);
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ FloatDatatypeValidator(const FloatDatatypeValidator&);
+ FloatDatatypeValidator& operator = (const FloatDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
index 850ab2a95696e3651465e53c9d3f99d43aad6005..ab9e2d4ed410a1ca28ee48e6004232243d2a7dbc 100644
--- a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -172,7 +175,7 @@ void HexBinaryDatatypeValidator::checkValueSpace(const XMLCh* const content
}
int HexBinaryDatatypeValidator::getLength(const XMLCh* const content
- , MemoryManager* const manager) const
+ , MemoryManager* const) const
{
return HexBin::getDataLength(content);
}
diff --git a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
index 84eebdb46059f33ea9160e15888d831bc79f5383..573cbd33f3562e1d03c4be5bfd5e70734b50f89e 100644
--- a/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/HexBinaryDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.7 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -143,6 +146,11 @@ protected:
, MemoryManager* const manager) const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ HexBinaryDatatypeValidator(const HexBinaryDatatypeValidator&);
+ HexBinaryDatatypeValidator& operator=(const HexBinaryDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/datatype/IDDatatypeValidator.hpp b/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
index 19d1350d53787c2e403c700f6e65b6c9c527ed2b..122a58ef8e296c0a166bd5f8835ce6bb4c13b81a 100644
--- a/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -202,7 +205,11 @@ protected:
, MemoryManager* const manager);
private:
-
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ IDDatatypeValidator(const IDDatatypeValidator&);
+ IDDatatypeValidator& operator=(const IDDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp b/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
index 80d6ff039ae5a07a17f024509101ab90b81e9944..222bcfdd7ce0c8b7dacd07acf143eae8b5c362a5 100644
--- a/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -201,6 +204,11 @@ protected:
, MemoryManager* const manager);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ IDREFDatatypeValidator(const IDREFDatatypeValidator&);
+ IDREFDatatypeValidator& operator=(const IDREFDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/datatype/ListDatatypeValidator.cpp b/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
index 88aad1d1c9c43ac6a71869abd4186ff9c69f683f..3b3dc3e72a90fce85e804b636e3d5fd37fa9f0aa 100644
--- a/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.22 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.21 2004/01/13 21:18:18 peiyongz
* revert code back to previous version
*
@@ -425,8 +428,8 @@ DatatypeValidator* ListDatatypeValidator::getItemTypeDTV() const
// Utilities
// ---------------------------------------------------------------------------
-void ListDatatypeValidator::checkValueSpace(const XMLCh* const content
- , MemoryManager* const manager)
+void ListDatatypeValidator::checkValueSpace(const XMLCh* const
+ , MemoryManager* const)
{}
int ListDatatypeValidator::getLength(const XMLCh* const content
@@ -581,8 +584,6 @@ const XMLCh* ListDatatypeValidator::getCanonicalRepresentation(const XMLCh*
{
return 0;
}
-
-
}
/***
diff --git a/src/xercesc/validators/datatype/ListDatatypeValidator.hpp b/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
index edd4256126ad6bb9e1d9d8d3e183a50981069261..05f5eec5e4953dc85c8e88630f2fb140f1629ec6 100644
--- a/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.12 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -286,6 +289,12 @@ private:
inline void setContent(const XMLCh* const content);
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ ListDatatypeValidator(const ListDatatypeValidator&);
+ ListDatatypeValidator& operator=(const ListDatatypeValidator&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp b/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
index 941a250b4f5d2fe36306ba708310ed8197bb04e5..9f6af31085cdce07f3c4ab686431786d9b48b546 100644
--- a/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/MonthDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -140,6 +143,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ MonthDatatypeValidator(const MonthDatatypeValidator&);
+ MonthDatatypeValidator& operator=(const MonthDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp b/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
index 1852bc13fe38d2409e1ca1ad25a88604e7ddb839..ecd58e0133f6b15c6a19e72fb7ce49d8dc2e12ba 100644
--- a/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/MonthDayDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -140,6 +143,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ MonthDayDatatypeValidator(const MonthDayDatatypeValidator&);
+ MonthDayDatatypeValidator& operator=(const MonthDayDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp b/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
index 03f2336a7b874698e2c8b11e2b25bd65832d1337..34007c4461b2e5603bb7807b8a46ef0ce7aca544 100644
--- a/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.9 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -148,7 +151,7 @@ NCNameDatatypeValidator::NCNameDatatypeValidator(
// -----------------------------------------------------------------------
int NCNameDatatypeValidator::compare(const XMLCh* const lValue
, const XMLCh* const rValue
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
return ( XMLString::equals(lValue, rValue)? 0 : -1);
}
diff --git a/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp b/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
index c24660ad997af089352d60b979a6eefa2bbdc68b..76cd018788ed5edb314bf3aa38b0adc5b39beafc 100644
--- a/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/NCNameDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -199,7 +202,11 @@ protected:
, MemoryManager* const manager);
private:
-
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ NCNameDatatypeValidator(const NCNameDatatypeValidator&);
+ NCNameDatatypeValidator& operator=(const NCNameDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
index 33ead1c1bf1cd8a44344b636a5aef64d5624ad67..a3609045580201b436d81f67d871d633b1c6f16d 100644
--- a/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/NOTATIONDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.7 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -151,13 +154,17 @@ protected:
, MemoryManager* const manager);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ NOTATIONDatatypeValidator(const NOTATIONDatatypeValidator&);
+ NOTATIONDatatypeValidator& operator=(const NOTATIONDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
//
// Nil
// -----------------------------------------------------------------------
-
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/NameDatatypeValidator.cpp b/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
index 5e432fda92596b3fd04f762441e8384b1e95eb3d..a5f108c76357664a6c99f83de388e5397496e8c9 100644
--- a/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.9 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.8 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -150,7 +153,7 @@ NameDatatypeValidator::NameDatatypeValidator(
// -----------------------------------------------------------------------
int NameDatatypeValidator::compare(const XMLCh* const lValue
, const XMLCh* const rValue
- , MemoryManager* const manager)
+ , MemoryManager* const)
{
return ( XMLString::equals(lValue, rValue)? 0 : -1);
}
diff --git a/src/xercesc/validators/datatype/NameDatatypeValidator.hpp b/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
index c54c6c2264d5f0ac53b7cfef7a47db921333662f..c4d870309cc5d565b8e43802e9e184bded529860 100644
--- a/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/NameDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -198,7 +201,11 @@ protected:
, MemoryManager* const manager);
private:
-
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ NameDatatypeValidator(const NameDatatypeValidator&);
+ NameDatatypeValidator& operator=(const NameDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp b/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
index dcf677b17b1fe9469c602afcb22a653fe0dd857e..a6c0aa9afff155d8a9df8072ec0fe4111467360c 100644
--- a/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/QNameDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.7 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.6 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -150,6 +153,11 @@ protected:
, MemoryManager* const manager);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ QNameDatatypeValidator(const QNameDatatypeValidator&);
+ QNameDatatypeValidator& operator=(const QNameDatatypeValidator&);
// -----------------------------------------------------------------------
// Private data members
diff --git a/src/xercesc/validators/datatype/StringDatatypeValidator.cpp b/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
index 6f12a33504028cf9e88b007894a312c98256af67..7f924516de98bde67a9f5b1cdf679b1ceada9478 100644
--- a/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/StringDatatypeValidator.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.11 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -303,8 +306,8 @@ void StringDatatypeValidator::checkAdditionalFacet(const XMLCh* const content
}
}
-void StringDatatypeValidator::checkValueSpace(const XMLCh* const content
- , MemoryManager* const manager)
+void StringDatatypeValidator::checkValueSpace(const XMLCh* const
+ , MemoryManager* const)
{}
/***
diff --git a/src/xercesc/validators/datatype/StringDatatypeValidator.hpp b/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
index 972588600b25bc8263a4204ed5c2959086160518..4a3d134da17aa295e843e2633314cd050839b5c6 100644
--- a/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/StringDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -173,6 +176,12 @@ protected:
virtual void checkValueSpace(const XMLCh* const content
, MemoryManager* const manager);
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ StringDatatypeValidator(const StringDatatypeValidator&);
+ StringDatatypeValidator& operator=(const StringDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp b/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
index 7300e6204eb1183ebed0de43f569e1f285da4983..8b6e51be38a0f31ac33e95b9c7616e829dc79d3e 100644
--- a/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/TimeDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.10 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.9 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -156,6 +159,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ TimeDatatypeValidator(const TimeDatatypeValidator&);
+ TimeDatatypeValidator& operator=(const TimeDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
index 1eb441a106881cf582690558991d549ffede284c..cbe2dcc00634200939ee66b8a2e8e11cdf364a2b 100644
--- a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.26 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.25 2004/01/13 21:18:18 peiyongz
* revert code back to previous version
*
@@ -171,10 +174,11 @@ static const unsigned int BUF_LEN = 64;
UnionDatatypeValidator::UnionDatatypeValidator(MemoryManager* const manager)
:DatatypeValidator(0, 0, 0, DatatypeValidator::Union, manager)
,fEnumerationInherited(false)
+,fMemberTypesInherited(false)
,fEnumeration(0)
,fMemberTypeValidators(0)
,fValidatedDatatype(0)
-,fMemberTypesInherited(false)
+
{}
UnionDatatypeValidator::~UnionDatatypeValidator()
@@ -188,10 +192,10 @@ UnionDatatypeValidator::UnionDatatypeValidator(
, MemoryManager* const manager)
:DatatypeValidator(0, 0, finalSet, DatatypeValidator::Union, manager)
,fEnumerationInherited(false)
+,fMemberTypesInherited(false)
,fEnumeration(0)
,fMemberTypeValidators(0)
,fValidatedDatatype(0)
-,fMemberTypesInherited(false)
{
if ( !memberTypeValidators )
{
@@ -214,10 +218,10 @@ UnionDatatypeValidator::UnionDatatypeValidator(
)
:DatatypeValidator(baseValidator, facets, finalSet, DatatypeValidator::Union, manager)
,fEnumerationInherited(false)
+,fMemberTypesInherited(memberTypesInherited)
,fEnumeration(0)
,fMemberTypeValidators(memberTypeValidators)
,fValidatedDatatype(0)
-,fMemberTypesInherited(memberTypesInherited)
{
//
// baseValidator another UnionDTV from which,
diff --git a/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp b/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
index 9470c732b365d8c78948831b938d4c0f4b5e8ff0..eb59e479a1ff52af877cc667b0b1f00d356c49b2 100644
--- a/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.17 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.16 2003/12/23 21:50:36 peiyongz
* Absorb exception thrown in getCanonicalRepresentation and return 0,
* only validate when required
@@ -318,6 +321,11 @@ public:
void reset();
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ UnionDatatypeValidator(const UnionDatatypeValidator&);
+ UnionDatatypeValidator& operator=(const UnionDatatypeValidator&);
virtual void checkContent(const XMLCh* const content
, ValidationContext* const context
diff --git a/src/xercesc/validators/datatype/YearDatatypeValidator.hpp b/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
index e3862085357d3d498ce35c635faf56fe4da70490..daff5e432d355f86b03a6ad4f3cc69917fd67c88 100644
--- a/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/YearDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -140,6 +143,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ YearDatatypeValidator(const YearDatatypeValidator&);
+ YearDatatypeValidator& operator=(const YearDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp b/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
index 9de083231b2d6dfed02581b81efb086ae469c7cc..348e9403597aa31199bd2efcbc5434b82a3db7eb 100644
--- a/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/YearMonthDatatypeValidator.hpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.8 2004/01/29 11:51:22 cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
* Revision 1.7 2003/12/17 00:18:39 cargilld
* Update to memory management so that the static memory manager (one used to call Initialize) is only for static data.
*
@@ -140,6 +143,13 @@ protected:
// -----------------------------------------------------------------------
virtual XMLDateTime* parse(const XMLCh* const, MemoryManager* const manager);
virtual void parse(XMLDateTime* const);
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ YearMonthDatatypeValidator(const YearMonthDatatypeValidator&);
+ YearMonthDatatypeValidator& operator=(const YearMonthDatatypeValidator&);
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.cpp b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
index 401d256febd5afe50b1fd11d40a64710ddd3c1b1..5cb3d3e16211623f799c503815a23b83897ef3b5 100644
--- a/src/xercesc/validators/schema/ComplexTypeInfo.cpp
+++ b/src/xercesc/validators/schema/ComplexTypeInfo.cpp
@@ -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 @@ ComplexTypeInfo::ComplexTypeInfo(MemoryManager* const manager)
, 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::getFormattedContentModel() const
// ---------------------------------------------------------------------------
// 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
diff --git a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
index 7730de2d4ec0f8549fd9a6f5a98d89cc2f0f031b..a74d978cbc8c8f8233e3abfd0b4c2133a89f37a2 100644
--- a/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
+++ b/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
@@ -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 @@ void GeneralAttributeCheck::initCharFlagTable()
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;
diff --git a/src/xercesc/validators/schema/SchemaAttDef.cpp b/src/xercesc/validators/schema/SchemaAttDef.cpp
index 00934a9da7e57a9304300f8cb939c5cdef988567..108039673907e8b22db4a4f10fed76da49fb1c9c 100644
--- a/src/xercesc/validators/schema/SchemaAttDef.cpp
+++ b/src/xercesc/validators/schema/SchemaAttDef.cpp
@@ -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 @@ SchemaAttDef::SchemaAttDef( const XMLCh* const prefix
XMLAttDef(type, defType, manager)
, fElemId(XMLElementDecl::fgInvalidElemId)
, fDatatypeValidator(0)
- , fMemberTypeValidator(0)
, fAnyDatatypeValidator(0)
+ , fMemberTypeValidator(0)
, fNamespaceList(0)
, fValidity(PSVIDefs::UNKNOWN)
, fValidation(PSVIDefs::NONE)
diff --git a/src/xercesc/validators/schema/SchemaAttDef.hpp b/src/xercesc/validators/schema/SchemaAttDef.hpp
index a4327308a1ebe8c609172ab77c919b6f018e78b4..b1775b8a44b0072bca704ee785059bb6c91b0306 100644
--- a/src/xercesc/validators/schema/SchemaAttDef.hpp
+++ b/src/xercesc/validators/schema/SchemaAttDef.hpp
@@ -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 @@ public :
DECL_XSERIALIZABLE(SchemaAttDef)
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaAttDef(const SchemaAttDef&);
+ SchemaAttDef& operator=(const SchemaAttDef&);
+
// -----------------------------------------------------------------------
// Private data members
//
diff --git a/src/xercesc/validators/schema/SchemaAttDefList.cpp b/src/xercesc/validators/schema/SchemaAttDefList.cpp
index 170e27f9534f012e6c9749d8bdc1463aacaa7567..c5c8a52634c6fdf130ca417e23bfc63ffec2227c 100644
--- a/src/xercesc/validators/schema/SchemaAttDefList.cpp
+++ b/src/xercesc/validators/schema/SchemaAttDefList.cpp
@@ -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 @@ SchemaAttDefList::SchemaAttDefList(RefHash2KeysTableOf<SchemaAttDef>* const list
,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 @@ SchemaAttDefList::findAttDef( const unsigned long uriID
}
-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 @@ XMLAttDef* SchemaAttDefList::findAttDef( const XMLCh* const attURI
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 @@ void SchemaAttDefList::serialize(XSerializeEngine& serEng)
}
SchemaAttDefList::SchemaAttDefList(MemoryManager* const manager)
-:fEnum(0)
+: XMLAttDefList(manager)
+,fEnum(0)
,fList(0)
,fArray(0)
-,fCount(0)
,fSize(0)
+,fCount(0)
{
}
diff --git a/src/xercesc/validators/schema/SchemaAttDefList.hpp b/src/xercesc/validators/schema/SchemaAttDefList.hpp
index be823b2191e516119ac901549a2ff2cfe2cdbf55..658d59e4b43773b7e9fff416997975e32149a062 100644
--- a/src/xercesc/validators/schema/SchemaAttDefList.hpp
+++ b/src/xercesc/validators/schema/SchemaAttDefList.hpp
@@ -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 @@ public :
SchemaAttDefList(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaAttDefList(const SchemaAttDefList&);
+ SchemaAttDefList& operator=(const SchemaAttDefList&);
+
void addAttDef(SchemaAttDef *toAdd);
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/schema/SchemaElementDecl.cpp b/src/xercesc/validators/schema/SchemaElementDecl.cpp
index 540c6e28af9bc81c66ccf487ffd6309d48a6724d..a1c525bdbfc6c275f7a01a939b281f2c306e2b4c 100644
--- a/src/xercesc/validators/schema/SchemaElementDecl.cpp
+++ b/src/xercesc/validators/schema/SchemaElementDecl.cpp
@@ -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 @@ SchemaElementDecl::SchemaElementDecl(MemoryManager* const manager) :
, 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 @@ SchemaElementDecl::SchemaElementDecl(const XMLCh* const prefix
, 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 @@ SchemaElementDecl::SchemaElementDecl(const QName* const element
, 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)
diff --git a/src/xercesc/validators/schema/SchemaElementDecl.hpp b/src/xercesc/validators/schema/SchemaElementDecl.hpp
index ccbe4844ae34952c7e3abab9bd5304b50d73359f..58756b518360b367cdde3d372dc13e3f6c6cf202 100644
--- a/src/xercesc/validators/schema/SchemaElementDecl.hpp
+++ b/src/xercesc/validators/schema/SchemaElementDecl.hpp
@@ -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 @@ public :
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
+ /**
+ * @deprecated; not actually used
+ */
void setElemId(unsigned int elemId);
void setModelType(const SchemaElementDecl::ModelTypes toSet);
void setPSVIScope(const PSVIDefs::PSVIScope toSet);
@@ -442,6 +448,12 @@ public :
virtual XMLElementDecl::objectType getObjectType() const;
private :
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaElementDecl(const SchemaElementDecl&);
+ SchemaElementDecl& operator=(const SchemaElementDecl&);
+
// -----------------------------------------------------------------------
// Private data members
//
@@ -518,8 +530,7 @@ private :
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 const ContentSpecNode* SchemaElementDecl::getContentSpec() const
}
inline void
-SchemaElementDecl::setContentSpec(ContentSpecNode* toAdopt)
+SchemaElementDecl::setContentSpec(ContentSpecNode*)
{
//Handled by complexType
}
@@ -571,7 +582,7 @@ inline XMLContentModel* SchemaElementDecl::getContentModel()
}
inline void
-SchemaElementDecl::setContentModel(XMLContentModel* const newModelToAdopt)
+SchemaElementDecl::setContentModel(XMLContentModel* const)
{
//Handled by complexType
}
@@ -816,7 +827,8 @@ inline const XMLCh* SchemaElementDecl::getDOMTypeInfoUri() const {
inline void
SchemaElementDecl::setElemId(unsigned int elemId)
{
- fElemId = elemId;
+ //there is not getElemId so this is not needed. mark deprecated.
+ //fElemId = elemId;
}
inline void
diff --git a/src/xercesc/validators/schema/SchemaGrammar.cpp b/src/xercesc/validators/schema/SchemaGrammar.cpp
index 57472f95339f716b9655677071171470dfed9a95..64993cc1bba7384008f66fa73176853779948ae9 100644
--- a/src/xercesc/validators/schema/SchemaGrammar.cpp
+++ b/src/xercesc/validators/schema/SchemaGrammar.cpp
@@ -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::findOrAddElemDecl (const unsigned int uriId
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)
{
diff --git a/src/xercesc/validators/schema/SchemaGrammar.hpp b/src/xercesc/validators/schema/SchemaGrammar.hpp
index 92f508b073a3440a7e3d6b3d52d39d252b2aec26..8a2da8908d6b9001ad6065c6ab1cf340ff894661 100644
--- a/src/xercesc/validators/schema/SchemaGrammar.hpp
+++ b/src/xercesc/validators/schema/SchemaGrammar.hpp
@@ -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 @@ public:
DECL_XSERIALIZABLE(SchemaGrammar)
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaGrammar(const SchemaGrammar&);
+ SchemaGrammar& operator=(const SchemaGrammar&);
// -----------------------------------------------------------------------
// Helper methods
diff --git a/src/xercesc/validators/schema/SchemaInfo.hpp b/src/xercesc/validators/schema/SchemaInfo.hpp
index bbd671b94983d6301bb16cef60bd1448d7cab2aa..22819491edf372a5087b37b050ed4cdaf9df9dfc 100644
--- a/src/xercesc/validators/schema/SchemaInfo.hpp
+++ b/src/xercesc/validators/schema/SchemaInfo.hpp
@@ -170,6 +170,12 @@ public:
void addRecursingType(const DOMElement* const elem, const XMLCh* const name);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaInfo(const SchemaInfo&);
+ SchemaInfo& operator=(const SchemaInfo&);
+
// -----------------------------------------------------------------------
// Private helper methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/schema/SchemaSymbols.hpp b/src/xercesc/validators/schema/SchemaSymbols.hpp
index 2c8911556fb12ff75c8b3f0a0b52e361f1e37001..b0563c7d97f58b6796146a9f87842fe3b3e5ef82 100644
--- a/src/xercesc/validators/schema/SchemaSymbols.hpp
+++ b/src/xercesc/validators/schema/SchemaSymbols.hpp
@@ -272,6 +272,11 @@ public :
XSD_FIXED = 4
};
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaSymbols();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/SchemaValidator.cpp b/src/xercesc/validators/schema/SchemaValidator.cpp
index ec22c1e77e8f661c1e9b48c4bcbd6dcb11fdb90b..fcac19dfd9abc5b62c8965abaa258e84faaf42c5 100644
--- a/src/xercesc/validators/schema/SchemaValidator.cpp
+++ b/src/xercesc/validators/schema/SchemaValidator.cpp
@@ -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 @@ SchemaValidator::SchemaValidator( XMLErrorReporter* const errReporter
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 @@ void SchemaValidator::validateElement(const XMLElementDecl* elemDef)
((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
diff --git a/src/xercesc/validators/schema/SchemaValidator.hpp b/src/xercesc/validators/schema/SchemaValidator.hpp
index 9ec5981460264cd1afc212f8bd97b04bf206f84a..df0f28dbbd0c116f3073224277e2deb7a64c6a1c 100644
--- a/src/xercesc/validators/schema/SchemaValidator.hpp
+++ b/src/xercesc/validators/schema/SchemaValidator.hpp
@@ -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 @@ public:
const XMLCh* getNormalizedValue() const;
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ SchemaValidator(const SchemaValidator&);
+ SchemaValidator& operator=(const SchemaValidator&);
+
// -----------------------------------------------------------------------
// Element Consitency Checking methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp b/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
index af4f07336ba1702fead6635ba354e8d829da9931..e454769a4a752752c777c9f61de1c7dc6ceb1556 100644
--- a/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
+++ b/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
@@ -125,14 +125,14 @@ public:
*/
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 @@ private:
// -----------------------------------------------------------------------
GrammarResolver *fGrammarResolver;
XMLStringPool *fStringPool;
-
};
diff --git a/src/xercesc/validators/schema/TraverseSchema.cpp b/src/xercesc/validators/schema/TraverseSchema.cpp
index 9791a72cb21e4580ec42977873424f6da4698211..8e3be830a577e8b077af672008ab65293b3e2624 100644
--- a/src/xercesc/validators/schema/TraverseSchema.cpp
+++ b/src/xercesc/validators/schema/TraverseSchema.cpp
@@ -225,7 +225,8 @@ TraverseSchema::TraverseSchema( DOMElement* const schemaRoot
, fComplexTypeRegistry(0)
, fGroupRegistry(0)
, fAttGroupRegistry(0)
- , fSchemaInfoList(0)
+ , fIC_ElementsNS(0)
+ , fPreprocessedNodes(0)
, fSchemaInfo(0)
, fCurrentGroupInfo(0)
, fCurrentAttGroupInfo(0)
@@ -237,15 +238,14 @@ TraverseSchema::TraverseSchema( DOMElement* const schemaRoot
, 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 @@ int TraverseSchema::traverseComplexTypeDecl(const DOMElement* const elem,
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 @@ int TraverseSchema::traverseComplexTypeDecl(const DOMElement* const elem,
// 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 @@ TraverseSchema::traverseElementDecl(const DOMElement* const elem,
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 @@ TraverseSchema::traverseByUnion(const DOMElement* const rootElem,
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 @@ void TraverseSchema::traverseSimpleContentDecl(const XMLCh* const typeName,
// -----------------------------------------------------------------------
// 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 @@ void TraverseSchema::traverseComplexContentDecl(const XMLCh* const typeName,
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 @@ TraverseSchema::getAttrDatatypeValidatorNS(const DOMElement* const elem,
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::checkMinMax(ContentSpecNode* const specNode,
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 @@ void TraverseSchema::processComplexContent(const DOMElement* const ctElem,
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 @@ ComplexTypeInfo* TraverseSchema::getTypeInfoFromNS(const DOMElement* const elem,
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 @@ void TraverseSchema::processSubstitutionGroup(const DOMElement* const elem,
}
}
- XMLCh* subsElemBaseName = subsElemDecl->getBaseName();
- int elemURI = elemDecl->getURI();
+ XMLCh* subsElemBaseName = subsElemDecl->getBaseName();
int subsElemURI = subsElemDecl->getURI();
ValueVectorOf<SchemaElementDecl*>* subsElements =
fValidSubstitutionGroups->get(subsElemBaseName, subsElemURI);
diff --git a/src/xercesc/validators/schema/TraverseSchema.hpp b/src/xercesc/validators/schema/TraverseSchema.hpp
index 0fa5af6c2d2ef008768bfa7e0eaebb81a2f92194..cd73a7451773c26f0b1d42fc02f8065471f091d0 100644
--- a/src/xercesc/validators/schema/TraverseSchema.hpp
+++ b/src/xercesc/validators/schema/TraverseSchema.hpp
@@ -426,8 +426,7 @@ private:
* 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 @@ private:
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 @@ private:
* 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);
diff --git a/src/xercesc/validators/schema/XSDDOMParser.cpp b/src/xercesc/validators/schema/XSDDOMParser.cpp
index 8561aee7a2abcc685d5d662c12bebfd3e8b5f555..a49b28ce800aa7bdf54fc83b7a4e72bc012e99e6 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.cpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.cpp
@@ -87,9 +87,10 @@ XSDDOMParser::XSDDOMParser( XMLValidator* const valToAdopt
, 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 @@ void XSDDOMParser::startAnnotation( const XMLElementDecl& elemDecl
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::startElement( const XMLElementDecl& elemDecl
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::docComment(const XMLCh* const comment)
}
}
-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)
diff --git a/src/xercesc/validators/schema/XSDDOMParser.hpp b/src/xercesc/validators/schema/XSDDOMParser.hpp
index 7ad9eb2f89cc4426d0a48a2cca749755295051a7..a1a7dcbfdb193d0a00bf1bbe04ca424d38cff648 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.hpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.hpp
@@ -314,6 +314,12 @@ protected :
const XMLCh *qualifiedName);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XSDDOMParser(const XSDDOMParser&);
+ XSDDOMParser& operator=(const XSDDOMParser&);
+
// -----------------------------------------------------------------------
// Private Helper methods
// -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/schema/XUtil.hpp b/src/xercesc/validators/schema/XUtil.hpp
index b6f0c1eecd2893a3d3f4073a3831ca945306d7e7..1f038e66b60f4f09cad9d26ee4d04129c2431be6 100644
--- a/src/xercesc/validators/schema/XUtil.hpp
+++ b/src/xercesc/validators/schema/XUtil.hpp
@@ -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 @@ public:
, const XMLCh* const uriStr
, unsigned int length);
-protected:
+private:
// -----------------------------------------------------------------------
// Constructors and Destructor
// -----------------------------------------------------------------------
@@ -124,7 +127,6 @@ protected:
// This class cannot be instantiated.
XUtil() {};
~XUtil() {};
-
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/identity/IC_Field.cpp b/src/xercesc/validators/schema/identity/IC_Field.cpp
index 81be17be8c1e601cfa60dad11e753809676954c4..e226a0a127b89eb6791fba533f6b9d10c3cf0094 100644
--- a/src/xercesc/validators/schema/identity/IC_Field.cpp
+++ b/src/xercesc/validators/schema/identity/IC_Field.cpp
@@ -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 @@ FieldMatcher::FieldMatcher(XercesXPath* const xpath,
FieldActivator* const fieldActivator,
MemoryManager* const manager)
: XPathMatcher(xpath, (IdentityConstraint*) 0, manager)
- , fField(aField)
, fValueStore(valueStore)
+ , fField(aField)
, fFieldActivator(fieldActivator)
{
}
@@ -159,8 +162,8 @@ bool IC_Field::operator!= (const IC_Field& other) const {
// ---------------------------------------------------------------------------
// IC_Field: Factory methods
// ---------------------------------------------------------------------------
-XPathMatcher* IC_Field::createMatcher(ValueStore* const valueStore,
- MemoryManager* const manager) {
+XPathMatcher* IC_Field::createMatcher(ValueStore* const,
+ MemoryManager* const) {
return 0;
}
diff --git a/src/xercesc/validators/schema/identity/IdentityConstraint.cpp b/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
index de3779163ae04b383f448b0ea05b25be95a25e44..2a7988cf18e5ed8abb73c20b0e9a244fb46351b1 100644
--- a/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
+++ b/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
@@ -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 @@ IdentityConstraint::IdentityConstraint(const XMLCh* const identityConstraintName
, fSelector(0)
, fFields(0)
, fMemoryManager(manager)
+ , fNamespaceURI(-1)
{
try {
fIdentityConstraintName = XMLString::replicate(identityConstraintName, fMemoryManager);
@@ -269,24 +273,19 @@ IdentityConstraint* IdentityConstraint::loadIC(XSerializeEngine& serEng)
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;
}
}
diff --git a/src/xercesc/validators/schema/identity/ValueStore.cpp b/src/xercesc/validators/schema/identity/ValueStore.cpp
index df095871632ca721d7223682815164d193f2ea1d..015cf74ba65c4bf1301c0fee1d8fe20046d68e6d 100644
--- a/src/xercesc/validators/schema/identity/ValueStore.cpp
+++ b/src/xercesc/validators/schema/identity/ValueStore.cpp
@@ -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::~ValueStore()
// ---------------------------------------------------------------------------
// 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) {
}
diff --git a/src/xercesc/validators/schema/identity/XPathMatcher.cpp b/src/xercesc/validators/schema/identity/XPathMatcher.cpp
index c98334bda980c19b04827a1dd1e96e43b1093bc3..a68ab8a62532ecef83da4907e4c42d3ae5cac5d1 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcher.cpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcher.cpp
@@ -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 @@ int XPathMatcher::isMatched() {
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;
}
diff --git a/src/xercesc/validators/schema/identity/XPathMatcher.hpp b/src/xercesc/validators/schema/identity/XPathMatcher.hpp
index 33bafd0b9185a79c422c8f8000c01b127577bfcb..68a60c48fc4326c14ecf81d082fe5ded26da0051 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcher.hpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcher.hpp
@@ -145,6 +145,11 @@ protected:
DatatypeValidator* const dv, const bool isNil);
private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XPathMatcher(const XPathMatcher&);
+ XPathMatcher& operator=(const XPathMatcher&);
// -----------------------------------------------------------------------
// Helper methods
diff --git a/src/xercesc/validators/schema/identity/XPathSymbols.hpp b/src/xercesc/validators/schema/identity/XPathSymbols.hpp
index 94d29b685f2ad5a3a4f4d04b475e87905054f6ed..80e314622720ce40f222bb7b9ccba6dcc513fb23 100644
--- a/src/xercesc/validators/schema/identity/XPathSymbols.hpp
+++ b/src/xercesc/validators/schema/identity/XPathSymbols.hpp
@@ -97,6 +97,11 @@ public :
static const XMLCh fgSYMBOL_PRECEDING_SIBLING[];
static const XMLCh fgSYMBOL_SELF[];
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ XPathSymbols();
};
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/validators/schema/identity/XercesXPath.cpp b/src/xercesc/validators/schema/identity/XercesXPath.cpp
index 6d390ff90b41a4b8bd6370546bea24e089eb169c..f393acaf8b306e4b358b2f3a6e9d06b727aa020c 100644
--- a/src/xercesc/validators/schema/identity/XercesXPath.cpp
+++ b/src/xercesc/validators/schema/identity/XercesXPath.cpp
@@ -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 @@ void XercesNodeTest::serialize(XSerializeEngine& serEng)
}
}
-XercesNodeTest::XercesNodeTest(MemoryManager* const manager)
+XercesNodeTest::XercesNodeTest(MemoryManager* const)
:fType(UNKNOWN)
,fName(0)
{
@@ -298,7 +301,7 @@ void XercesStep::serialize(XSerializeEngine& serEng)
}
}
-XercesStep::XercesStep(MemoryManager* const manager)
+XercesStep::XercesStep(MemoryManager* const)
:fAxisType(UNKNOWN)
,fNodeTest(0)
{
@@ -359,7 +362,7 @@ void XercesLocationPath::serialize(XSerializeEngine& serEng)
}
}
-XercesLocationPath::XercesLocationPath(MemoryManager* const manager)
+XercesLocationPath::XercesLocationPath(MemoryManager* const)
:fSteps(0)
{
}
@@ -1418,8 +1421,6 @@ int XPathScanner::scanNumber(const XMLCh* const data,
if (++currentOffset < endOffset) {
- int start = currentOffset;
-
ch = data[currentOffset];
while (ch >= chDigit_0 && ch <= chDigit_9) {