diff --git a/doc/html/ApacheDOMC++Binding.html b/doc/html/ApacheDOMC++Binding.html
index 101e7a0bc548977c732e840edc959dfd5aab8056..7081c5e456ac42d8aaa8daeeacceeeacc399ca86 100644
--- a/doc/html/ApacheDOMC++Binding.html
+++ b/doc/html/ApacheDOMC++Binding.html
@@ -35,12 +35,12 @@ to unsigned 16 bit type holding utf-16 values, null terminated.</font></li>
</ul>
<li>
-<font color="#000000">DOMSize_t is an implementation-dependent unsigned
+<font color="#000000">XMLSize_t is an implementation-dependent unsigned
integral type</font></li>
<ul>
<li>
-<font color="#000000">typedef size_t DOMSize_t</font></li>
+<font color="#000000">typedef size_t XMLSize_t</font></li>
</ul>
<li>
@@ -1137,7 +1137,7 @@ DOMNodeList</font></font>
<td><font face="Courier New,Courier"><font size=-1>DOMNode*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>item(DOMSize_t index)
+<td><font face="Courier New,Courier"><font size=-1>item(XMLSize_t index)
= 0;</font></font></td>
</tr>
@@ -1146,7 +1146,7 @@ DOMNodeList</font></font>
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>DOMSize_t</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>XMLSize_t</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getLength() = 0;</font></font></td>
</tr>
@@ -1207,7 +1207,7 @@ arg) = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>DOMNode*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>item(DOMSize_t index)
+<td><font face="Courier New,Courier"><font size=-1>item(XMLSize_t index)
const = 0;</font></font></td>
</tr>
@@ -1227,7 +1227,7 @@ name) const = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>DOMSize_t</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>XMLSize_t</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getLength() const =
0;</font></font></td>
@@ -1330,7 +1330,7 @@ DOMCharacterData : public DOMNode</font></font>
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>DOMSize_t</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>XMLSize_t</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getLength() const =
0;</font></font></td>
@@ -1343,8 +1343,8 @@ DOMCharacterData : public DOMNode</font></font>
<td><font face="Courier New,Courier"><font size=-1>const XMLCh*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>substringData(DOMSize_t
-offset, DOMSize_t count) const = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>substringData(XMLSize_t
+offset, XMLSize_t count) const = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -1365,7 +1365,7 @@ arg) = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>insertData(DOMSize_t
+<td><font face="Courier New,Courier"><font size=-1>insertData(XMLSize_t
offset, const XMLCh* arg) = 0;</font></font></td>
</tr>
@@ -1376,8 +1376,8 @@ offset, const XMLCh* arg) = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>deleteData(DOMSize_t
-offset, DOMSize_t count) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>deleteData(XMLSize_t
+offset, XMLSize_t count) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -1387,8 +1387,8 @@ offset, DOMSize_t count) = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>replaceData(DOMSize_t
-offset, DOMSize_t count, const XMLCh* arg) = 0;</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>replaceData(XMLSize_t
+offset, XMLSize_t count, const XMLCh* arg) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -1766,7 +1766,7 @@ DOMText : DOMCharacterData</font></font>
<td><font face="Courier New,Courier"><font size=-1>DOMText*</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>splitText(DOMSize_t
+<td><font face="Courier New,Courier"><font size=-1>splitText(XMLSize_t
offset) = 0;</font></font></td>
</tr>
@@ -2981,7 +2981,7 @@ const = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>DOMSize_t</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>XMLSize_t</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getStartOffset() const
= 0;</font></font></td>
@@ -3003,7 +3003,7 @@ const = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>virtual</font></font></td>
-<td><font face="Courier New,Courier"><font size=-1>DOMSize_t</font></font></td>
+<td><font face="Courier New,Courier"><font size=-1>XMLSize_t</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>getEndOffset() const
= 0;</font></font></td>
@@ -3039,7 +3039,7 @@ const = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>setStart(const DOMNode*
-parent, DOMSize_t offset) = 0;</font></font></td>
+parent, XMLSize_t offset) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
@@ -3050,7 +3050,7 @@ parent, DOMSize_t offset) = 0;</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>void</font></font></td>
<td><font face="Courier New,Courier"><font size=-1>setEnd(const DOMNode*
-parent, DOMSize_t offset) = 0;</font></font></td>
+parent, XMLSize_t offset) = 0;</font></font></td>
</tr>
<tr ALIGN=LEFT VALIGN=TOP>
diff --git a/src/xercesc/dom/DOMCharacterData.hpp b/src/xercesc/dom/DOMCharacterData.hpp
index eb3c0daa09f50be60da544d3c13f2e4787de24da..dc9a65080b0c6a6759ccfc57b2aea0d3e2031049 100644
--- a/src/xercesc/dom/DOMCharacterData.hpp
+++ b/src/xercesc/dom/DOMCharacterData.hpp
@@ -117,7 +117,7 @@ public:
* This may have the value
* zero, i.e., <code>CharacterData</code> nodes may be empty.
*/
- virtual DOMSize_t getLength() const = 0;
+ virtual XMLSize_t getLength() const = 0;
/**
* Extracts a range of data from the node.
*
@@ -131,8 +131,8 @@ public:
* than the number of characters in <code>data</code>, or if the
* specified <code>count</code> is negative.
*/
- virtual const XMLCh * substringData(DOMSize_t offset,
- DOMSize_t count) const = 0;
+ virtual const XMLCh * substringData(XMLSize_t offset,
+ XMLSize_t count) const = 0;
//@}
/** @name Functions that set or change data. */
//@{
@@ -156,7 +156,7 @@ public:
* than the number of characters in <code>data</code>.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual void insertData(DOMSize_t offset, const XMLCh *arg) = 0;
+ virtual void insertData(XMLSize_t offset, const XMLCh *arg) = 0;
/**
* Remove a range of characters from the node.
*
@@ -173,8 +173,8 @@ public:
* specified <code>count</code> is negative.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual void deleteData(DOMSize_t offset,
- DOMSize_t count) = 0;
+ virtual void deleteData(XMLSize_t offset,
+ XMLSize_t count) = 0;
/**
* Replace the characters starting at the specified character offset with
* the specified string.
@@ -193,8 +193,8 @@ public:
* specified <code>count</code> is negative.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual void replaceData(DOMSize_t offset,
- DOMSize_t count,
+ virtual void replaceData(XMLSize_t offset,
+ XMLSize_t count,
const XMLCh *arg) = 0;
/**
diff --git a/src/xercesc/dom/DOMNamedNodeMap.hpp b/src/xercesc/dom/DOMNamedNodeMap.hpp
index fe5648550556ae07b846eabb7fe931735e8c759c..ce5c18b70ccb1400bd2cb2ac79a076e8fb165e8d 100644
--- a/src/xercesc/dom/DOMNamedNodeMap.hpp
+++ b/src/xercesc/dom/DOMNamedNodeMap.hpp
@@ -137,7 +137,7 @@ public:
* <code>NamedNodeMap</code>, or <code>null</code> if that is not a valid
* index.
*/
- virtual DOMNode *item(DOMSize_t index) const = 0;
+ virtual DOMNode *item(XMLSize_t index) const = 0;
/**
* Retrieves a node specified by name.
@@ -155,7 +155,7 @@ public:
* The range of valid child node indices is
* 0 to <code>length-1</code> inclusive.
*/
- virtual DOMSize_t getLength() const = 0;
+ virtual XMLSize_t getLength() const = 0;
//@}
/** @name Functions to change the node collection. */
diff --git a/src/xercesc/dom/DOMNodeList.hpp b/src/xercesc/dom/DOMNodeList.hpp
index f4b57f56279654790facfa22c5f97b4489ea4ec3..3eddd2db5685d3bc00db8c54216e4115386e9d02 100644
--- a/src/xercesc/dom/DOMNodeList.hpp
+++ b/src/xercesc/dom/DOMNodeList.hpp
@@ -105,14 +105,14 @@ public:
* <code>NodeList</code>, or <code>null</code> if that is not a valid
* index.
*/
- virtual DOMNode *item(DOMSize_t index) = 0;
+ virtual DOMNode *item(XMLSize_t index) = 0;
/**
* Returns the number of nodes in the list.
*
* The range of valid child node indices is 0 to <code>length-1</code> inclusive.
*/
- virtual DOMSize_t getLength() = 0;
+ virtual XMLSize_t getLength() = 0;
//@}
};
diff --git a/src/xercesc/dom/DOMRange.hpp b/src/xercesc/dom/DOMRange.hpp
index 99bfc3e1207cb84dbfd1f047d3a56edeb0b0dd7e..c250055fd71a1367b75466b8674ebdb5b7792cbe 100644
--- a/src/xercesc/dom/DOMRange.hpp
+++ b/src/xercesc/dom/DOMRange.hpp
@@ -85,15 +85,15 @@ public:
//getter functions
virtual DOMNode* getStartContainer() const = 0;
- virtual DOMSize_t getStartOffset() const = 0;
+ virtual XMLSize_t getStartOffset() const = 0;
virtual DOMNode* getEndContainer() const = 0;
- virtual DOMSize_t getEndOffset() const = 0;
+ virtual XMLSize_t getEndOffset() const = 0;
virtual bool getCollapsed() const = 0;
virtual const DOMNode* getCommonAncestorContainer() const = 0;
//setter functions
- virtual void setStart(const DOMNode *parent, DOMSize_t offset) = 0;
- virtual void setEnd(const DOMNode *parent, DOMSize_t offset) = 0;
+ virtual void setStart(const DOMNode *parent, XMLSize_t offset) = 0;
+ virtual void setEnd(const DOMNode *parent, XMLSize_t offset) = 0;
virtual void setStartBefore(const DOMNode *refNode) = 0;
virtual void setStartAfter(const DOMNode *refNode) = 0;
diff --git a/src/xercesc/dom/DOMText.hpp b/src/xercesc/dom/DOMText.hpp
index 3ab9ee34670731856fa9cdea1f10026d7df46f8d..ea93912ebd03b717a785c5cafc3be435f25d2f0c 100644
--- a/src/xercesc/dom/DOMText.hpp
+++ b/src/xercesc/dom/DOMText.hpp
@@ -129,7 +129,7 @@ class CDOM_EXPORT DOMText: public DOMCharacterData {
* than the number of 16-bit units in <code>data</code>.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual DOMText *splitText(DOMSize_t offset) = 0;
+ virtual DOMText *splitText(XMLSize_t offset) = 0;
//@}
/** @name Non-standard (not defined by the DOM specification) functions. */
diff --git a/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp b/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
index ddc5ddf023aef08572a1f7aaae6a9ccd67e72dc0..0b38967770a4b29025ee3f90eaca7c7e3048cc20 100644
--- a/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
@@ -116,15 +116,15 @@ bool DOMCDATASectionImpl::isIgnorableWhitespace() const
// splitText. revist - factor into a common function for use
// here and in DOMTextImpl
//
-DOMText *DOMCDATASectionImpl::splitText(DOMSize_t offset)
+DOMText *DOMCDATASectionImpl::splitText(XMLSize_t offset)
{
if (fNode.isReadOnly())
{
throw DOMException(
DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
}
- DOMSize_t len = XMLString::stringLen(fCharacterData.fData);
- if (offset > len)
+ XMLSize_t len = XMLString::stringLen(fCharacterData.fData);
+ if (offset > len || offset < 0)
throw DOMException(DOMException::INDEX_SIZE_ERR, 0);
DOMText *newText =
@@ -143,9 +143,9 @@ DOMText *DOMCDATASectionImpl::splitText(DOMSize_t offset)
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- DOMSize_t sz = ranges->size();
+ XMLSize_t sz = ranges->size();
if (sz != 0) {
- for (DOMSize_t i =0; i<sz; i++) {
+ for (XMLSize_t i =0; i<sz; i++) {
ranges->elementAt(i)->updateSplitInfo( this, newText, offset);
}
}
@@ -194,15 +194,15 @@ DOMText *DOMCDATASectionImpl::splitText(DOMSize_t offset)
const XMLCh * DOMCDATASectionImpl::getData() const {return fCharacterData.getData();};
- DOMSize_t DOMCDATASectionImpl::getLength() const {return fCharacterData.getLength();};
- const XMLCh * DOMCDATASectionImpl::substringData(DOMSize_t offset, DOMSize_t count) const
+ 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);};
- void DOMCDATASectionImpl::insertData(DOMSize_t offset, const XMLCh *arg)
+ void DOMCDATASectionImpl::insertData(XMLSize_t offset, const XMLCh *arg)
{fCharacterData.insertData(this, offset, arg);};
- void DOMCDATASectionImpl::deleteData(DOMSize_t offset, DOMSize_t count)
+ void DOMCDATASectionImpl::deleteData(XMLSize_t offset, XMLSize_t count)
{fCharacterData.deleteData(this, offset, count);};
- void DOMCDATASectionImpl::replaceData(DOMSize_t offset, DOMSize_t count, const XMLCh *arg)
+ 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); };
diff --git a/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp b/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
index c8be200ab9833dadcba565687e6d194a9766615d..c8a98b2fbed6b01aeb407b4695ddbf7d5d953eb8 100644
--- a/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCDATASectionImpl.hpp
@@ -93,8 +93,8 @@ public:
virtual ~DOMCDATASectionImpl();
// Functions inherited from TEXT
- virtual DOMText *splitText(DOMSize_t offset);
- virtual bool isIgnorableWhitespace() const;
+ virtual DOMText* splitText(XMLSize_t offset);
+ virtual bool isIgnorableWhitespace() const;
@@ -103,18 +103,18 @@ public:
// Functions introduced by DOMCharacterData
- virtual const XMLCh * getData() const;
- virtual DOMSize_t getLength() const;
- virtual const XMLCh * substringData(DOMSize_t offset,
- DOMSize_t count) const;
- virtual void appendData(const XMLCh *arg);
- virtual void insertData(DOMSize_t offset, const XMLCh *arg);
- virtual void deleteData(DOMSize_t offset,
- DOMSize_t count);
- virtual void replaceData(DOMSize_t offset,
- DOMSize_t count,
- const XMLCh *arg);
- virtual void setData(const XMLCh *data);
+ virtual const XMLCh* getData() const;
+ virtual XMLSize_t getLength() const;
+ virtual const XMLCh* substringData(XMLSize_t offset,
+ XMLSize_t count) const;
+ virtual void appendData(const XMLCh *arg);
+ virtual void insertData(XMLSize_t offset, const XMLCh *arg);
+ virtual void deleteData(XMLSize_t offset,
+ XMLSize_t count);
+ virtual void replaceData(XMLSize_t offset,
+ XMLSize_t count,
+ const XMLCh *arg);
+ virtual void setData(const XMLCh *data);
};
diff --git a/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp b/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
index ed66c89b3a51a21d67c6929c32828e4df528e000..360f9d143abeca00b3eda4429a128f7f5df21f23 100644
--- a/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCharacterDataImpl.cpp
@@ -100,9 +100,9 @@ void DOMCharacterDataImpl::setNodeValue(const DOMNode *node, const XMLCh *value)
if (node->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)node->getOwnerDocument())->getRanges();
if (ranges != 0) {
- DOMSize_t sz = ranges->size();
+ XMLSize_t sz = ranges->size();
if (sz != 0) {
- for (DOMSize_t i =0; i<sz; i++) {
+ for (XMLSize_t i =0; i<sz; i++) {
ranges->elementAt(i)->receiveReplacedText((DOMNode*)node);
}
}
@@ -125,7 +125,7 @@ void DOMCharacterDataImpl::appendData(const DOMNode *node, const XMLCh *dat)
};
-void DOMCharacterDataImpl::deleteData(const DOMNode *node, DOMSize_t offset, DOMSize_t count)
+void DOMCharacterDataImpl::deleteData(const DOMNode *node, XMLSize_t offset, XMLSize_t count)
{
if (castToNodeImpl(node)->isReadOnly())
throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
@@ -134,7 +134,7 @@ void DOMCharacterDataImpl::deleteData(const DOMNode *node, DOMSize_t offset, DOM
// when parameter values are bad.
//
- DOMSize_t len = XMLString::stringLen(this->fData);
+ XMLSize_t len = XMLString::stringLen(this->fData);
if (offset > len || offset < 0 || count < 0)
throw DOMException(DOMException::INDEX_SIZE_ERR, 0);
@@ -150,7 +150,7 @@ void DOMCharacterDataImpl::deleteData(const DOMNode *node, DOMSize_t offset, DOM
if (offset + count >= len)
count = len - offset;
- DOMSize_t newLen = len - count;
+ XMLSize_t newLen = len - count;
XMLCh* newString;
XMLCh temp[4000];
@@ -174,9 +174,9 @@ void DOMCharacterDataImpl::deleteData(const DOMNode *node, DOMSize_t offset, DOM
if (node->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)node->getOwnerDocument())->getRanges();
if (ranges != 0) {
- DOMSize_t sz = ranges->size();
+ XMLSize_t sz = ranges->size();
if (sz != 0) {
- for (DOMSize_t i =0; i<sz; i++) {
+ for (XMLSize_t i =0; i<sz; i++) {
ranges->elementAt(i)->updateRangeForDeletedText( (DOMNode*)node, offset, count);
}
}
@@ -195,14 +195,14 @@ const XMLCh *DOMCharacterDataImpl::getData() const
//
// getCharDataLength - return the length of the character data string.
//
-DOMSize_t DOMCharacterDataImpl::getLength() const
+XMLSize_t DOMCharacterDataImpl::getLength() const
{
return XMLString::stringLen(fData);
};
-void DOMCharacterDataImpl::insertData(const DOMNode *node, DOMSize_t offset, const XMLCh *dat)
+void DOMCharacterDataImpl::insertData(const DOMNode *node, XMLSize_t offset, const XMLCh *dat)
{
if (castToNodeImpl(node)->isReadOnly())
throw DOMException(
@@ -212,13 +212,13 @@ void DOMCharacterDataImpl::insertData(const DOMNode *node, DOMSize_t offset, con
// when parameter values are bad.
//
- DOMSize_t len = XMLString::stringLen(this->fData);
+ XMLSize_t len = XMLString::stringLen(this->fData);
if (offset > len || offset < 0)
throw DOMException(DOMException::INDEX_SIZE_ERR, 0);
- DOMSize_t datLen = XMLString::stringLen(dat);
+ XMLSize_t datLen = XMLString::stringLen(dat);
- DOMSize_t newLen = len + datLen;
+ XMLSize_t newLen = len + datLen;
XMLCh* newString;
XMLCh temp[4000];
@@ -239,7 +239,7 @@ void DOMCharacterDataImpl::insertData(const DOMNode *node, DOMSize_t offset, con
-void DOMCharacterDataImpl::replaceData(const DOMNode *node, DOMSize_t offset, DOMSize_t count,
+void DOMCharacterDataImpl::replaceData(const DOMNode *node, XMLSize_t offset, XMLSize_t count,
const XMLCh *dat)
{
if (castToNodeImpl(node)->isReadOnly())
@@ -264,8 +264,8 @@ void DOMCharacterDataImpl::setData(const DOMNode *node, const XMLCh *arg)
-const XMLCh * DOMCharacterDataImpl::substringData(const DOMNode *node, DOMSize_t offset,
- DOMSize_t count) const
+const XMLCh * DOMCharacterDataImpl::substringData(const DOMNode *node, XMLSize_t offset,
+ XMLSize_t count) const
{
// Note: the C++ XMLCh * operation throws the correct DOMExceptions
@@ -273,7 +273,7 @@ const XMLCh * DOMCharacterDataImpl::substringData(const DOMNode *node, DOMSize_t
//
- DOMSize_t len = XMLString::stringLen(fData);
+ XMLSize_t len = XMLString::stringLen(fData);
if (offset > len || offset < 0 || count < 0)
throw DOMException(DOMException::INDEX_SIZE_ERR, 0);
diff --git a/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp b/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
index 4e748ae7dab3549e237c1e97e5bceb346ea52c84..a06faa04c3d184c7e524c2c24014f12d3481c94d 100644
--- a/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCharacterDataImpl.hpp
@@ -92,16 +92,16 @@ public:
const XMLCh * getNodeValue() const;
void setNodeValue(const XMLCh * value);
void appendData(const DOMNode *node, const XMLCh *data);
- void deleteData(const DOMNode *node, DOMSize_t offset, DOMSize_t count);
- const XMLCh * getData() const;
- DOMSize_t getLength() const;
- void insertData(const DOMNode *node, DOMSize_t offset, const XMLCh * data);
- void replaceData(const DOMNode *node, DOMSize_t offset, DOMSize_t count, const XMLCh * data);
+ void deleteData(const DOMNode *node, XMLSize_t offset, XMLSize_t count);
+ const XMLCh* getData() const;
+ XMLSize_t getLength() const;
+ void insertData(const DOMNode *node, XMLSize_t offset, const XMLCh * data);
+ void replaceData(const DOMNode *node, XMLSize_t offset, XMLSize_t count, const XMLCh * data);
void setData(const DOMNode *node, const XMLCh * arg);
void setNodeValue(const DOMNode *node, const XMLCh *value);
- const XMLCh * substringData(const DOMNode *node, DOMSize_t offset, DOMSize_t count) const;
+ const XMLCh* substringData(const DOMNode *node, XMLSize_t offset, XMLSize_t count) const;
};
diff --git a/src/xercesc/dom/impl/DOMCommentImpl.cpp b/src/xercesc/dom/impl/DOMCommentImpl.cpp
index 70d9a8182c9fc5f42df3f51deb9191c5297f12c5..ecff360ae92283b67a6f07b73ddd24fabad90678 100644
--- a/src/xercesc/dom/impl/DOMCommentImpl.cpp
+++ b/src/xercesc/dom/impl/DOMCommentImpl.cpp
@@ -138,15 +138,15 @@ short DOMCommentImpl::getNodeType() const {
const XMLCh * DOMCommentImpl::getData() const {return fCharacterData.getData();};
- DOMSize_t DOMCommentImpl::getLength() const {return fCharacterData.getLength();};
- const XMLCh * DOMCommentImpl::substringData(DOMSize_t offset, DOMSize_t count) const
+ 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);};
- void DOMCommentImpl::insertData(DOMSize_t offset, const XMLCh *arg)
+ void DOMCommentImpl::insertData(XMLSize_t offset, const XMLCh *arg)
{fCharacterData.insertData(this, offset, arg);};
- void DOMCommentImpl::deleteData(DOMSize_t offset, DOMSize_t count)
+ void DOMCommentImpl::deleteData(XMLSize_t offset, XMLSize_t count)
{fCharacterData.deleteData(this, offset, count);};
- void DOMCommentImpl::replaceData(DOMSize_t offset, DOMSize_t count, const XMLCh *arg)
+ 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); };
diff --git a/src/xercesc/dom/impl/DOMCommentImpl.hpp b/src/xercesc/dom/impl/DOMCommentImpl.hpp
index 696f6773a35e23c0c67164ae6df64077c8e77a5f..5153718a86067d66e9ef9951babfeb28a0f7206e 100644
--- a/src/xercesc/dom/impl/DOMCommentImpl.hpp
+++ b/src/xercesc/dom/impl/DOMCommentImpl.hpp
@@ -96,13 +96,13 @@ public:
// Functions from DOMCharacterData
virtual void appendData(const XMLCh *data);
- virtual void deleteData(DOMSize_t offset, DOMSize_t count);
+ virtual void deleteData(XMLSize_t offset, XMLSize_t count);
virtual const XMLCh * getData() const;
- virtual DOMSize_t getLength() const;
- virtual void insertData(DOMSize_t offset, const XMLCh * data);
- virtual void replaceData(DOMSize_t offset, DOMSize_t count, const XMLCh * data);
+ virtual XMLSize_t getLength() const;
+ virtual void insertData(XMLSize_t offset, const XMLCh * data);
+ virtual void replaceData(XMLSize_t offset, XMLSize_t count, const XMLCh * data);
virtual void setData(const XMLCh * arg);
- virtual const XMLCh * substringData(DOMSize_t offset, DOMSize_t count) const;
+ virtual const XMLCh * substringData(XMLSize_t offset, XMLSize_t count) const;
};
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp b/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
index f7d8d5359fa2790007775da962d92369a628738f..6aaf5080bff954540fb463af0fc82d0daf88bb5e 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
@@ -105,7 +105,7 @@ DOMDeepNodeListImpl::~DOMDeepNodeListImpl()
{
}
-DOMSize_t DOMDeepNodeListImpl::getLength()
+XMLSize_t DOMDeepNodeListImpl::getLength()
{
// Reset cache to beginning of list
item(0);
@@ -127,9 +127,9 @@ DOMSize_t DOMDeepNodeListImpl::getLength()
// irrelevant ones. Doing so in a really useful manner would seem
// to involve a tree-walk in its own right, or maintaining our data
// in a parallel tree.
-DOMNode *DOMDeepNodeListImpl::item(DOMSize_t index)
+DOMNode *DOMDeepNodeListImpl::item(XMLSize_t index)
{
- DOMSize_t currentIndexPlus1 = fCurrentIndexPlus1;
+ XMLSize_t currentIndexPlus1 = fCurrentIndexPlus1;
DOMNode *currentNode = fCurrentNode;
if (castToParentImpl(fRootNode)->changes() != fChanges)
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp b/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
index 04c942d9e97c5cc79c1fd8ce08f966281bb7fa82..c5046242f7af9ce1a7dce1ed8f609ea8348b339a 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
@@ -78,29 +78,29 @@ class DOMNode;
class CDOM_EXPORT DOMDeepNodeListImpl: public DOMNodeList {
private:
- const DOMNode *fRootNode;
- const XMLCh *fTagName;
- bool fMatchAll;
- int fChanges;
- DOMNode *fCurrentNode;
- DOMSize_t fCurrentIndexPlus1;
+ const DOMNode* fRootNode;
+ const XMLCh* fTagName;
+ bool fMatchAll;
+ int fChanges;
+ DOMNode* fCurrentNode;
+ XMLSize_t fCurrentIndexPlus1;
//DOM Level 2
- const XMLCh * fNamespaceURI;
- bool fMatchAllURI;
- bool fMatchURIandTagname; //match both namespaceURI and tagName
+ const XMLCh* fNamespaceURI;
+ bool fMatchAllURI;
+ bool fMatchURIandTagname; //match both namespaceURI and tagName
public:
DOMDeepNodeListImpl(const DOMNode *rootNode, const XMLCh *tagName);
DOMDeepNodeListImpl(const DOMNode *rootNode, //DOM Level 2
const XMLCh *namespaceURI,
const XMLCh *localName);
- virtual ~DOMDeepNodeListImpl();
- virtual DOMSize_t getLength();
- virtual DOMNode *item(DOMSize_t index);
+ virtual ~DOMDeepNodeListImpl();
+ virtual XMLSize_t getLength();
+ virtual DOMNode* item(XMLSize_t index);
private:
- DOMNode * nextMatchingElementAfter(DOMNode *current);
+ DOMNode* nextMatchingElementAfter(DOMNode *current);
};
#endif
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListPool.c b/src/xercesc/dom/impl/DOMDeepNodeListPool.c
index 36bd1bd9e247c40994cf6abbe1dde01e2a1349ae..adf4607867c1719f7a9095ab74c93ebaacac79ca 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListPool.c
+++ b/src/xercesc/dom/impl/DOMDeepNodeListPool.c
@@ -71,9 +71,9 @@
// DOMDeepNodeListPool: Constructors and Destructor
// ---------------------------------------------------------------------------
template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(
- const DOMSize_t modulus
+ const XMLSize_t modulus
, const bool adoptElems
- , const DOMSize_t initSize) :
+ , const XMLSize_t initSize) :
fAdoptedElems(adoptElems)
, fBucketList(0)
, fHashModulus(modulus)
@@ -98,10 +98,10 @@ template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(
}
template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(
- const DOMSize_t modulus
+ const XMLSize_t modulus
, const bool adoptElems
, HashBase* hash
- , const DOMSize_t initSize) :
+ , const XMLSize_t initSize) :
fAdoptedElems(adoptElems)
, fBucketList(0)
, fHashModulus(modulus)
@@ -124,8 +124,8 @@ template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(
fIdPtrs[0] = 0;
}
-template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(const DOMSize_t modulus
- , const DOMSize_t initSize) :
+template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(const XMLSize_t modulus
+ , const XMLSize_t initSize) :
fAdoptedElems(true)
, fBucketList(0)
, fHashModulus(modulus)
@@ -149,14 +149,14 @@ template <class TVal> DOMDeepNodeListPool<TVal>::DOMDeepNodeListPool(const DOMSi
fIdPtrs[0] = 0;
}
-template <class TVal> void DOMDeepNodeListPool<TVal>::initialize(const DOMSize_t modulus)
+template <class TVal> void DOMDeepNodeListPool<TVal>::initialize(const XMLSize_t modulus)
{
if (modulus == 0)
ThrowXML(IllegalArgumentException, XMLExcepts::HshTbl_ZeroModulus);
// Allocate the bucket list and zero them
fBucketList = new DOMDeepNodeListPoolTableBucketElem<TVal>*[fHashModulus];
- for (DOMSize_t index = 0; index < fHashModulus; index++)
+ for (XMLSize_t index = 0; index < fHashModulus; index++)
fBucketList[index] = 0;
}
@@ -177,7 +177,7 @@ template <class TVal> DOMDeepNodeListPool<TVal>::~DOMDeepNodeListPool()
template <class TVal> bool DOMDeepNodeListPool<TVal>::isEmpty() const
{
// Just check the bucket list for non-empty elements
- for (DOMSize_t buckInd = 0; buckInd < fHashModulus; buckInd++)
+ for (XMLSize_t buckInd = 0; buckInd < fHashModulus; buckInd++)
{
if (fBucketList[buckInd] != 0)
return false;
@@ -188,7 +188,7 @@ template <class TVal> bool DOMDeepNodeListPool<TVal>::isEmpty() const
template <class TVal> bool DOMDeepNodeListPool<TVal>::
containsKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3) const
{
- DOMSize_t hashVal;
+ XMLSize_t hashVal;
const DOMDeepNodeListPoolTableBucketElem<TVal>* findIt = findBucketElem(key1, key2, key3, hashVal);
return (findIt != 0);
}
@@ -196,7 +196,7 @@ containsKey(const void* const key1, const XMLCh* const key2, const XMLCh* const
template <class TVal> void DOMDeepNodeListPool<TVal>::removeAll()
{
// Clean up the buckets first
- for (DOMSize_t buckInd = 0; buckInd < fHashModulus; buckInd++)
+ for (XMLSize_t buckInd = 0; buckInd < fHashModulus; buckInd++)
{
// Get the bucket list head for this entry
DOMDeepNodeListPoolTableBucketElem<TVal>* curElem = fBucketList[buckInd];
@@ -247,7 +247,7 @@ template <class TVal> void DOMDeepNodeListPool<TVal>::cleanup()
template <class TVal> TVal*
DOMDeepNodeListPool<TVal>::getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3)
{
- DOMSize_t hashVal;
+ XMLSize_t hashVal;
DOMDeepNodeListPoolTableBucketElem<TVal>* findIt = findBucketElem(key1, key2, key3, hashVal);
if (!findIt)
return 0;
@@ -257,7 +257,7 @@ DOMDeepNodeListPool<TVal>::getByKey(const void* const key1, const XMLCh* const k
template <class TVal> const TVal*
DOMDeepNodeListPool<TVal>::getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3) const
{
- DOMSize_t hashVal;
+ XMLSize_t hashVal;
const DOMDeepNodeListPoolTableBucketElem<TVal>* findIt = findBucketElem(key1, key2, key3, hashVal);
if (!findIt)
return 0;
@@ -265,7 +265,7 @@ DOMDeepNodeListPool<TVal>::getByKey(const void* const key1, const XMLCh* const k
}
template <class TVal> TVal*
-DOMDeepNodeListPool<TVal>::getById(const DOMSize_t elemId)
+DOMDeepNodeListPool<TVal>::getById(const XMLSize_t elemId)
{
// If its either zero or beyond our current id, its an error
if (!elemId || (elemId > fIdCounter))
@@ -275,7 +275,7 @@ DOMDeepNodeListPool<TVal>::getById(const DOMSize_t elemId)
}
template <class TVal> const TVal*
-DOMDeepNodeListPool<TVal>::getById(const DOMSize_t elemId) const
+DOMDeepNodeListPool<TVal>::getById(const XMLSize_t elemId) const
{
// If its either zero or beyond our current id, its an error
if (!elemId || (elemId > fIdCounter))
@@ -287,11 +287,11 @@ DOMDeepNodeListPool<TVal>::getById(const DOMSize_t elemId) const
// ---------------------------------------------------------------------------
// DOMDeepNodeListPool: Putters
// ---------------------------------------------------------------------------
-template <class TVal> DOMSize_t
+template <class TVal> XMLSize_t
DOMDeepNodeListPool<TVal>::put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const valueToAdopt)
{
// First see if the key exists already
- DOMSize_t hashVal;
+ XMLSize_t hashVal;
DOMDeepNodeListPoolTableBucketElem<TVal>* newBucket = findBucketElem(key1, key2, key3, hashVal);
//
@@ -324,7 +324,7 @@ DOMDeepNodeListPool<TVal>::put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const
if (fIdCounter + 1 == fIdPtrsCount)
{
// Create a new count 1.5 times larger and allocate a new array
- DOMSize_t newCount = (DOMSize_t)(fIdPtrsCount * 1.5);
+ XMLSize_t newCount = (XMLSize_t)(fIdPtrsCount * 1.5);
TVal** newArray = new TVal*[newCount];
// Copy over the old contents to the new array
@@ -335,7 +335,7 @@ DOMDeepNodeListPool<TVal>::put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const
fIdPtrs = newArray;
fIdPtrsCount = newCount;
}
- const DOMSize_t retId = ++fIdCounter;
+ const XMLSize_t retId = ++fIdCounter;
fIdPtrs[retId] = valueToAdopt;
// Return the id that we gave to this element
@@ -346,7 +346,7 @@ DOMDeepNodeListPool<TVal>::put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const
// DOMDeepNodeListPool: Private methods
// ---------------------------------------------------------------------------
template <class TVal> DOMDeepNodeListPoolTableBucketElem<TVal>* DOMDeepNodeListPool<TVal>::
-findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, DOMSize_t& hashVal)
+findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal)
{
// Hash the key
hashVal = fHash->getHashVal(key1, fHashModulus);
@@ -382,7 +382,7 @@ findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* con
}
template <class TVal> const DOMDeepNodeListPoolTableBucketElem<TVal>* DOMDeepNodeListPool<TVal>::
-findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, DOMSize_t& hashVal) const
+findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal) const
{
// Hash the key
hashVal = fHash->getHashVal(key1, fHashModulus);
diff --git a/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp b/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
index 7c0ab2e96debca52a9713776c92f1af4af89a261..a5c044f6ac904c36ecf4b18555373b058e2ee91b 100644
--- a/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
+++ b/src/xercesc/dom/impl/DOMDeepNodeListPool.hpp
@@ -132,16 +132,16 @@ public:
// backwards compatability - default hasher is HashXMLCh
DOMDeepNodeListPool
(
- const DOMSize_t modulus
- , const DOMSize_t initSize = 128
+ const XMLSize_t modulus
+ , const XMLSize_t initSize = 128
);
// backwards compatability - default hasher is HashXMLCh
DOMDeepNodeListPool
(
- const DOMSize_t modulus
+ const XMLSize_t modulus
, const bool adoptElems
- , const DOMSize_t initSize = 128
+ , const XMLSize_t initSize = 128
);
// if a hash function is passed in, it will be deleted when the hashtable is deleted.
@@ -149,9 +149,9 @@ public:
// may delete the hasher of a different hashtable if both use the same hasher.
DOMDeepNodeListPool
(
- const DOMSize_t modulus
+ const XMLSize_t modulus
, const bool adoptElems, HashBase* hash
- , const DOMSize_t initSize = 128
+ , const XMLSize_t initSize = 128
);
~DOMDeepNodeListPool();
@@ -171,22 +171,22 @@ public:
TVal* getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3);
const TVal* getByKey(const void* const key1, const XMLCh* const key2, const XMLCh* const key3) const;
- TVal* getById(const DOMSize_t elemId);
- const TVal* getById(const DOMSize_t elemId) const;
+ TVal* getById(const XMLSize_t elemId);
+ const TVal* getById(const XMLSize_t elemId) const;
// -----------------------------------------------------------------------
// Putters
// -----------------------------------------------------------------------
- DOMSize_t put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const valueToAdopt);
+ XMLSize_t put(void* key1, XMLCh* key2, XMLCh* key3, TVal* const valueToAdopt);
private:
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
- DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, DOMSize_t& hashVal);
- const DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, DOMSize_t& hashVal) const;
- void initialize(const DOMSize_t modulus);
+ DOMDeepNodeListPoolTableBucketElem<TVal>* findBucketElem(const void* const key1, const XMLCh* const key2, const XMLCh* const key3, XMLSize_t& hashVal);
+ 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);
// -----------------------------------------------------------------------
@@ -222,13 +222,13 @@ private:
// element. So the first element is 1, the next is 2, etc... This
// means that this value is set to the top index of the fIdPtrs array.
// -----------------------------------------------------------------------
- bool fAdoptedElems;
+ bool fAdoptedElems;
DOMDeepNodeListPoolTableBucketElem<TVal>** fBucketList;
- DOMSize_t fHashModulus;
- HashBase* fHash;
- TVal** fIdPtrs;
- DOMSize_t fIdPtrsCount;
- DOMSize_t fIdCounter;
+ XMLSize_t fHashModulus;
+ HashBase* fHash;
+ TVal** fIdPtrs;
+ XMLSize_t fIdPtrsCount;
+ XMLSize_t fIdCounter;
};
#if !defined(XERCES_TMPLSINC)