dbertoni 2003/02/12 15:08:05
Modified: c/src/XPath MutableNodeRefList.cpp ResultTreeFragBase.hpp
XObjectResultTreeFragProxyBase.cpp
XObjectResultTreeFragProxyBase.hpp
XObjectResultTreeFragProxyText.cpp
XObjectResultTreeFragProxyText.hpp
Log:
Fixed inconsistency with return type of getIndex().
Revision Changes Path
1.28 +2 -2 xml-xalan/c/src/XPath/MutableNodeRefList.cpp
Index: MutableNodeRefList.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/MutableNodeRefList.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MutableNodeRefList.cpp 21 Nov 2002 01:35:03 -0000 1.27
+++ MutableNodeRefList.cpp 12 Feb 2003 23:08:04 -0000 1.28
@@ -389,7 +389,7 @@
// At this point, we are guaranteed that the range is only for this
// document, and that the range is indexed...
- const unsigned long theIndex = node->getIndex();
+ const XalanNode::IndexType theIndex = node->getIndex();
typedef MutableNodeRefList::NodeListIteratorType
NodeListIteratorType;
@@ -409,7 +409,7 @@
NodeListIteratorType first(begin);
NodeListIteratorType current(end);
- unsigned long theCurrentIndex = 0;
+ XalanNode::IndexType theCurrentIndex = 0;
while (first <= last)
{
1.16 +1 -1 xml-xalan/c/src/XPath/ResultTreeFragBase.hpp
Index: ResultTreeFragBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFragBase.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ResultTreeFragBase.hpp 21 Nov 2002 01:26:18 -0000 1.15
+++ ResultTreeFragBase.hpp 12 Feb 2003 23:08:04 -0000 1.16
@@ -200,7 +200,7 @@
virtual bool
isIndexed() const = 0;
- virtual unsigned long
+ virtual IndexType
getIndex() const = 0;
virtual ResultTreeFragBase*
1.5 +1 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.cpp
Index: XObjectResultTreeFragProxyBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XObjectResultTreeFragProxyBase.cpp 21 Nov 2002 01:26:18 -0000
1.4
+++ XObjectResultTreeFragProxyBase.cpp 12 Feb 2003 23:08:05 -0000
1.5
@@ -310,7 +310,7 @@
-unsigned long
+XObjectResultTreeFragProxyBase::IndexType
XObjectResultTreeFragProxyBase::getIndex() const
{
return 0;
1.5 +1 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.hpp
Index: XObjectResultTreeFragProxyBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyBase.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XObjectResultTreeFragProxyBase.hpp 21 Nov 2002 01:26:18 -0000
1.4
+++ XObjectResultTreeFragProxyBase.hpp 12 Feb 2003 23:08:05 -0000
1.5
@@ -177,7 +177,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
1.6 +1 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.cpp
Index: XObjectResultTreeFragProxyText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XObjectResultTreeFragProxyText.cpp 21 Dec 2002 00:20:45 -0000
1.5
+++ XObjectResultTreeFragProxyText.cpp 12 Feb 2003 23:08:05 -0000
1.6
@@ -319,7 +319,7 @@
-unsigned long
+XObjectResultTreeFragProxyText::IndexType
XObjectResultTreeFragProxyText::getIndex() const
{
return 0;
1.4 +1 -1 xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.hpp
Index: XObjectResultTreeFragProxyText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObjectResultTreeFragProxyText.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XObjectResultTreeFragProxyText.hpp 21 Nov 2002 01:26:18 -0000
1.3
+++ XObjectResultTreeFragProxyText.hpp 12 Feb 2003 23:08:05 -0000
1.4
@@ -440,7 +440,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
