dbertoni 2003/02/12 15:05:43
Modified: c/src/XercesParserLiaison XercesAttrBridge.cpp
XercesAttrBridge.hpp XercesAttrWrapper.cpp
XercesAttrWrapper.hpp XercesBridgeNavigator.cpp
XercesBridgeNavigator.hpp
XercesCDATASectionBridge.cpp
XercesCDATASectionBridge.hpp
XercesCDATASectionWrapper.cpp
XercesCDATASectionWrapper.hpp
XercesCommentBridge.cpp XercesCommentBridge.hpp
XercesCommentWrapper.cpp XercesCommentWrapper.hpp
XercesDocumentBridge.cpp XercesDocumentBridge.hpp
XercesDocumentFragmentBridge.cpp
XercesDocumentFragmentBridge.hpp
XercesDocumentTypeBridge.cpp
XercesDocumentTypeBridge.hpp
XercesDocumentTypeWrapper.cpp
XercesDocumentTypeWrapper.hpp
XercesDocumentWrapper.cpp XercesDocumentWrapper.hpp
XercesElementBridge.cpp XercesElementBridge.hpp
XercesElementWrapper.cpp XercesElementWrapper.hpp
XercesEntityBridge.cpp XercesEntityBridge.hpp
XercesEntityReferenceBridge.cpp
XercesEntityReferenceBridge.hpp
XercesEntityReferenceWrapper.cpp
XercesEntityReferenceWrapper.hpp
XercesEntityWrapper.cpp XercesEntityWrapper.hpp
XercesNotationBridge.cpp XercesNotationBridge.hpp
XercesNotationWrapper.cpp XercesNotationWrapper.hpp
XercesProcessingInstructionBridge.cpp
XercesProcessingInstructionBridge.hpp
XercesProcessingInstructionWrapper.cpp
XercesProcessingInstructionWrapper.hpp
XercesTextBridge.cpp XercesTextBridge.hpp
XercesTextWrapper.cpp XercesTextWrapper.hpp
XercesWrapperNavigator.cpp
XercesWrapperNavigator.hpp
Log:
Fixed inconsistency with return type of getIndex().
Revision Changes Path
1.7 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.cpp
Index: XercesAttrBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesAttrBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
+++ XercesAttrBridge.cpp 12 Feb 2003 23:05:39 -0000 1.7
@@ -317,7 +317,7 @@
-unsigned long
+XercesAttrBridge::IndexType
XercesAttrBridge::getIndex() const
{
return m_navigator.getIndex();
1.10 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.hpp
Index: XercesAttrBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesAttrBridge.hpp 22 Nov 2002 01:12:49 -0000 1.9
+++ XercesAttrBridge.hpp 12 Feb 2003 23:05:39 -0000 1.10
@@ -437,7 +437,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.3 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.cpp
Index: XercesAttrWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesAttrWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesAttrWrapper.cpp 12 Feb 2003 23:05:39 -0000 1.3
@@ -325,7 +325,7 @@
-unsigned long
+XercesAttrWrapper::IndexType
XercesAttrWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.hpp
Index: XercesAttrWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesAttrWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesAttrWrapper.hpp 12 Feb 2003 23:05:39 -0000 1.3
@@ -433,7 +433,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.10 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.cpp
Index: XercesBridgeNavigator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesBridgeNavigator.cpp 22 Nov 2002 01:12:49 -0000 1.9
+++ XercesBridgeNavigator.cpp 12 Feb 2003 23:05:39 -0000 1.10
@@ -93,7 +93,7 @@
m_nextSibling(mappingMode == true ? invalidNodeAddress : 0),
m_firstChild(mappingMode == true ? invalidNodeAddress : 0),
m_lastChild(mappingMode == true ? invalidNodeAddress : 0),
- m_index(UINT_MAX)
+ m_index(0)
{
}
1.9 +6 -4
xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.hpp
Index: XercesBridgeNavigator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesBridgeNavigator.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesBridgeNavigator.hpp 12 Feb 2003 23:05:39 -0000 1.9
@@ -68,6 +68,7 @@
#include <XalanDOM/XalanDOMString.hpp>
+#include <XalanDOM/XalanNode.hpp>
@@ -82,7 +83,6 @@
class XercesDocumentBridge;
class XalanAttr;
class XalanElement;
-class XalanNode;
class XalanText;
@@ -91,6 +91,8 @@
{
public:
+ typedef XalanNode::IndexType IndexType;
+
explicit
XercesBridgeNavigator(
XercesDocumentBridge* theOwnerDocument = 0,
@@ -126,14 +128,14 @@
DOM_AttrType
mapNode(const XalanAttr* theXercesNode) const;
- unsigned long
+ IndexType
getIndex() const
{
return m_index;
}
void
- setIndex(unsigned long theIndex)
+ setIndex(IndexType theIndex)
{
m_index = theIndex;
}
@@ -278,7 +280,7 @@
mutable XalanNode* m_lastChild;
- unsigned long m_index;
+ IndexType m_index;
};
1.8 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.cpp
Index: XercesCDATASectionBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesCDATASectionBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
+++ XercesCDATASectionBridge.cpp 12 Feb 2003 23:05:39 -0000 1.8
@@ -321,7 +321,7 @@
-unsigned long
+XercesCDATASectionBridge::IndexType
XercesCDATASectionBridge::getIndex() const
{
return m_navigator.getIndex();
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.hpp
Index: XercesCDATASectionBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesCDATASectionBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesCDATASectionBridge.hpp 12 Feb 2003 23:05:39 -0000 1.9
@@ -437,7 +437,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.cpp
Index: XercesCDATASectionWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesCDATASectionWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesCDATASectionWrapper.cpp 12 Feb 2003 23:05:39 -0000 1.3
@@ -319,7 +319,7 @@
-unsigned long
+XercesCDATASectionWrapper::IndexType
XercesCDATASectionWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.hpp
Index: XercesCDATASectionWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesCDATASectionWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesCDATASectionWrapper.hpp 12 Feb 2003 23:05:39 -0000 1.3
@@ -429,7 +429,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.7 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.cpp
Index: XercesCommentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesCommentBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
+++ XercesCommentBridge.cpp 12 Feb 2003 23:05:39 -0000 1.7
@@ -315,7 +315,7 @@
-unsigned long
+XercesCommentBridge::IndexType
XercesCommentBridge::getIndex() const
{
return m_navigator.getIndex();
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.hpp
Index: XercesCommentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesCommentBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesCommentBridge.hpp 12 Feb 2003 23:05:39 -0000 1.9
@@ -436,7 +436,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.cpp
Index: XercesCommentWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesCommentWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesCommentWrapper.cpp 12 Feb 2003 23:05:39 -0000 1.3
@@ -315,7 +315,7 @@
-unsigned long
+XercesCommentWrapper::IndexType
XercesCommentWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.hpp
Index: XercesCommentWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesCommentWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesCommentWrapper.hpp 12 Feb 2003 23:05:39 -0000 1.3
@@ -425,7 +425,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.30 +18 -18
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XercesDocumentBridge.cpp 2 Dec 2002 23:51:21 -0000 1.29
+++ XercesDocumentBridge.cpp 12 Feb 2003 23:05:39 -0000 1.30
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -333,7 +333,7 @@
XercesDocumentTypeBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_DocumentType_Type& theDoctype,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// This is a special case, since there is only one
@@ -373,7 +373,7 @@
XercesElementBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_ElementType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
@@ -408,7 +408,7 @@
XercesDocumentFragmentBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_DocumentFragmentType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
@@ -444,7 +444,7 @@
XercesTextBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_TextType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
@@ -478,7 +478,7 @@
XercesCommentBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_CommentType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
@@ -514,7 +514,7 @@
XercesCDATASectionBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_CDATASectionType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
@@ -550,7 +550,7 @@
XercesProcessingInstructionBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_ProcessingInstructionType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
@@ -586,7 +586,7 @@
XercesAttrBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_AttrType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
@@ -618,7 +618,7 @@
XercesEntityBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_EntityType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
@@ -652,7 +652,7 @@
XercesEntityReferenceBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_EntityReferenceType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
@@ -688,8 +688,8 @@
XercesNotationBridge*
XercesDocumentBridge::createBridgeNode(
const DOM_NotationType& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ IndexType
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -722,7 +722,7 @@
XalanNode*
XercesDocumentBridge::createBridgeNode(
const DOM_NodeType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
XalanNode* theNewNode = 0;
@@ -1202,7 +1202,7 @@
-unsigned long
+XercesDocumentBridge::IndexType
XercesDocumentBridge::getIndex() const
{
assert(m_navigator != 0);
@@ -1448,8 +1448,8 @@
XalanNode*
XercesDocumentBridge::importNode(
- XalanNode* importedNode,
- bool deep)
+ XalanNode* /* importedNode */,
+ bool /* deep */)
{
throw XercesDOMException(XercesDOMException::NOT_SUPPORTED_ERR);
@@ -1592,7 +1592,7 @@
XercesDocumentBridge* theDocument,
XercesBridgeNavigator* theDocumentNavigator,
NavigatorBridgeVectorType& theNavigators,
- unsigned long theStartIndex) :
+ IndexType
theStartIndex) :
m_document(theDocument),
m_navigators(theNavigators),
m_currentIndex(theStartIndex),
1.25 +16 -16
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XercesDocumentBridge.hpp 28 Nov 2002 00:26:07 -0000 1.24
+++ XercesDocumentBridge.hpp 12 Feb 2003 23:05:39 -0000 1.25
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -241,7 +241,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
virtual XalanElement*
@@ -387,7 +387,7 @@
XercesDocumentBridge*
theDocument,
XercesBridgeNavigator*
theDocumentNavigator,
NavigatorBridgeVectorInnerType& theNavigators,
- unsigned long
theStartIndex);
+ IndexType
theStartIndex);
virtual
~BuildBridgeTreeWalker();
@@ -427,7 +427,7 @@
NavigatorBridgeVectorInnerType& m_navigators;
- unsigned long m_currentIndex;
+ IndexType
m_currentIndex;
NavigatorStackType
m_parentNavigatorStack;
@@ -491,73 +491,73 @@
XalanNode*
createBridgeNode(
const DOM_NodeType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesDocumentTypeBridge*
createBridgeNode(
const DOM_DocumentType_Type& theDoctype,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesElementBridge*
createBridgeNode(
const DOM_ElementType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesDocumentFragmentBridge*
createBridgeNode(
const DOM_DocumentFragmentType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesTextBridge*
createBridgeNode(
const DOM_TextType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesCommentBridge*
createBridgeNode(
const DOM_CommentType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesCDATASectionBridge*
createBridgeNode(
const DOM_CDATASectionType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesProcessingInstructionBridge*
createBridgeNode(
const DOM_ProcessingInstructionType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesAttrBridge*
createBridgeNode(
const DOM_AttrType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesEntityBridge*
createBridgeNode(
const DOM_EntityType& theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesEntityReferenceBridge*
createBridgeNode(
const DOM_EntityReferenceType& theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesNotationBridge*
createBridgeNode(
const DOM_NotationType& theXercesNode,
- unsigned long theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesBridgeNavigator&
1.8 +1 -5
xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.cpp
Index: XercesDocumentFragmentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDocumentFragmentBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
+++ XercesDocumentFragmentBridge.cpp 12 Feb 2003 23:05:39 -0000 1.8
@@ -310,18 +310,14 @@
// $$$ ToDo: Are document fragments ever indexed?
// I don't think so...
return false;
-
-// return m_navigator.getOwnerDocument()->isIndexed();
}
-unsigned long
+XercesDocumentFragmentBridge::IndexType
XercesDocumentFragmentBridge::getIndex() const
{
return 0;
-
-// return m_navigator.getIndex();
}
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.hpp
Index: XercesDocumentFragmentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesDocumentFragmentBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesDocumentFragmentBridge.hpp 12 Feb 2003 23:05:39 -0000 1.9
@@ -438,7 +438,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
/**
1.10 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp
Index: XercesDocumentTypeBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesDocumentTypeBridge.cpp 28 Nov 2002 00:26:07 -0000 1.9
+++ XercesDocumentTypeBridge.cpp 12 Feb 2003 23:05:39 -0000 1.10
@@ -323,7 +323,7 @@
-unsigned long
+XercesDocumentTypeBridge::IndexType
XercesDocumentTypeBridge::getIndex() const
{
return m_navigator.getIndex();
1.11 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp
Index: XercesDocumentTypeBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XercesDocumentTypeBridge.hpp 28 Nov 2002 00:26:07 -0000 1.10
+++ XercesDocumentTypeBridge.hpp 12 Feb 2003 23:05:39 -0000 1.11
@@ -438,7 +438,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.5 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
Index: XercesDocumentTypeWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDocumentTypeWrapper.cpp 28 Nov 2002 00:26:07 -0000 1.4
+++ XercesDocumentTypeWrapper.cpp 12 Feb 2003 23:05:39 -0000 1.5
@@ -319,7 +319,7 @@
-unsigned long
+XercesDocumentTypeWrapper::IndexType
XercesDocumentTypeWrapper::getIndex() const
{
return m_navigator.getIndex();
1.5 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp
Index: XercesDocumentTypeWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDocumentTypeWrapper.hpp 28 Nov 2002 00:26:07 -0000 1.4
+++ XercesDocumentTypeWrapper.hpp 12 Feb 2003 23:05:39 -0000 1.5
@@ -430,7 +430,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.12 +29 -29
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp
Index: XercesDocumentWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XercesDocumentWrapper.cpp 25 Jan 2003 01:02:42 -0000 1.11
+++ XercesDocumentWrapper.cpp 12 Feb 2003 23:05:39 -0000 1.12
@@ -123,7 +123,7 @@
m_documentElement(0),
m_nodeMap(),
m_domImplementation(new
XercesDOMImplementationWrapper(theXercesDocument->getImplementation())),
- m_navigators(1, XercesWrapperNavigator(this, threadSafe == true ? false
: !buildWrapper)),
+ m_navigators(1, XercesWrapperNavigator(this)),
m_navigator(&m_navigators.front()),
m_children(theXercesDocument->getChildNodes(),
*m_navigator),
@@ -389,7 +389,7 @@
XercesWrapperNavigator&
-XercesDocumentWrapper::pushNavigator(bool mappingMode) const
+XercesDocumentWrapper::pushNavigator() const
{
XercesDocumentWrapper* const This =
#if defined(XALAN_OLD_STYLE_CASTS)
@@ -398,7 +398,7 @@
const_cast<XercesDocumentWrapper*>(this);
#endif
- This->m_navigators.push_back(XercesWrapperNavigator(This, mappingMode));
+ This->m_navigators.push_back(XercesWrapperNavigator(This));
return This->m_navigators.back();
}
@@ -408,7 +408,7 @@
XercesDocumentTypeWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMDocumentType_Type* theDoctype,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// This is a special case, since there is only one
@@ -418,7 +418,7 @@
m_xercesDocument->getDoctype() == theDoctype);
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -448,11 +448,11 @@
XercesElementWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMElementType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -483,11 +483,11 @@
XercesTextWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMTextType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -517,11 +517,11 @@
XercesCommentWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMCommentType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -553,11 +553,11 @@
XercesCDATASectionWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMCDATASectionType* theXercesNode,
- unsigned long theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -589,11 +589,11 @@
XercesProcessingInstructionWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMProcessingInstructionType*
theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -625,11 +625,11 @@
XercesAttrWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMAttrType* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ IndexType theIndex,
+ bool /* mapNode */) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -657,11 +657,11 @@
XercesEntityWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMEntityType* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ IndexType theIndex,
+ bool /* mapNode */)
const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -691,11 +691,11 @@
XercesEntityReferenceWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMEntityReferenceType* theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -727,11 +727,11 @@
XercesNotationWrapper*
XercesDocumentWrapper::createWrapperNode(
const DOMNotationType* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ IndexType theIndex,
+ bool /* mapNode */)
const
{
// Create a navigator...
- XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
+ XercesWrapperNavigator& theNavigator = pushNavigator();
theNavigator.setIndex(theIndex);
@@ -761,7 +761,7 @@
XalanNode*
XercesDocumentWrapper::createWrapperNode(
const DOMNodeType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const
{
assert(theXercesNode != 0);
@@ -1184,7 +1184,7 @@
-unsigned long
+XercesDocumentWrapper::IndexType
XercesDocumentWrapper::getIndex() const
{
assert(m_navigator != 0);
@@ -1439,7 +1439,7 @@
XercesDocumentWrapper* theDocument,
XercesWrapperNavigator*
theDocumentNavigator,
WrapperNavigatorVectorType& theNavigators,
- unsigned long
theStartIndex,
+ IndexType
theStartIndex,
bool
theBuildMapsFlag) :
m_document(theDocument),
m_navigators(theNavigators),
1.8 +15 -15
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp
Index: XercesDocumentWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDocumentWrapper.hpp 25 Jan 2003 01:02:42 -0000 1.7
+++ XercesDocumentWrapper.hpp 12 Feb 2003 23:05:40 -0000 1.8
@@ -234,7 +234,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
virtual XalanElement*
@@ -414,7 +414,7 @@
XercesDocumentWrapper*
theDocument,
XercesWrapperNavigator*
theDocumentNavigator,
WrapperNavigatorVectorInnerType&
theNavigators,
- unsigned long
theStartIndex,
+ IndexType
theStartIndex,
bool
theBuildMapsFlag);
virtual
@@ -455,7 +455,7 @@
WrapperNavigatorVectorInnerType& m_navigators;
- unsigned long
m_currentIndex;
+ IndexType
m_currentIndex;
NavigatorStackType
m_parentNavigatorStack;
@@ -513,71 +513,71 @@
XalanNode*
createWrapperNode(
const DOMNodeType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesDocumentTypeWrapper*
createWrapperNode(
const DOMDocumentType_Type* theDoctype,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesElementWrapper*
createWrapperNode(
const DOMElementType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesTextWrapper*
createWrapperNode(
const DOMTextType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesCommentWrapper*
createWrapperNode(
const DOMCommentType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesCDATASectionWrapper*
createWrapperNode(
const DOMCDATASectionType* theXercesNode,
- unsigned long theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesProcessingInstructionWrapper*
createWrapperNode(
const DOMProcessingInstructionType*
theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesAttrWrapper*
createWrapperNode(
const DOMAttrType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesEntityWrapper*
createWrapperNode(
const DOMEntityType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesEntityReferenceWrapper*
createWrapperNode(
const DOMEntityReferenceType* theXercesNode,
- unsigned long
theIndex,
+ IndexType
theIndex,
bool
mapNode) const;
XercesNotationWrapper*
createWrapperNode(
const DOMNotationType* theXercesNode,
- unsigned long theIndex,
+ IndexType theIndex,
bool mapNode) const;
XercesWrapperNavigator&
- pushNavigator(bool mappingMode) const;
+ pushNavigator() const;
// This is a private helper class for building the tree...
friend class BuildWrapperTreeWalker;
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.cpp
Index: XercesElementBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesElementBridge.cpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesElementBridge.cpp 12 Feb 2003 23:05:40 -0000 1.9
@@ -316,7 +316,7 @@
-unsigned long
+XercesElementBridge::IndexType
XercesElementBridge::getIndex() const
{
return m_navigator.getIndex();
1.10 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.hpp
Index: XercesElementBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesElementBridge.hpp 22 Nov 2002 01:12:49 -0000 1.9
+++ XercesElementBridge.hpp 12 Feb 2003 23:05:40 -0000 1.10
@@ -449,7 +449,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.4 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.cpp
Index: XercesElementWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesElementWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.3
+++ XercesElementWrapper.cpp 12 Feb 2003 23:05:40 -0000 1.4
@@ -323,7 +323,7 @@
-unsigned long
+XercesElementWrapper::IndexType
XercesElementWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.hpp
Index: XercesElementWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesElementWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesElementWrapper.hpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -439,7 +439,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.8 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.cpp
Index: XercesEntityBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesEntityBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
+++ XercesEntityBridge.cpp 12 Feb 2003 23:05:40 -0000 1.8
@@ -309,7 +309,7 @@
-unsigned long
+XercesEntityBridge::IndexType
XercesEntityBridge::getIndex() const
{
return m_navigator.getIndex();
1.10 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.hpp
Index: XercesEntityBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesEntityBridge.hpp 22 Nov 2002 01:12:49 -0000 1.9
+++ XercesEntityBridge.hpp 12 Feb 2003 23:05:40 -0000 1.10
@@ -438,7 +438,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.7 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.cpp
Index: XercesEntityReferenceBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesEntityReferenceBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
+++ XercesEntityReferenceBridge.cpp 12 Feb 2003 23:05:40 -0000 1.7
@@ -309,7 +309,7 @@
-unsigned long
+XercesEntityReferenceBridge::IndexType
XercesEntityReferenceBridge::getIndex() const
{
return m_navigator.getIndex();
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.hpp
Index: XercesEntityReferenceBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesEntityReferenceBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesEntityReferenceBridge.hpp 12 Feb 2003 23:05:40 -0000 1.9
@@ -437,7 +437,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
/**
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.cpp
Index: XercesEntityReferenceWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesEntityReferenceWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesEntityReferenceWrapper.cpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -317,7 +317,7 @@
-unsigned long
+XercesEntityReferenceWrapper::IndexType
XercesEntityReferenceWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.hpp
Index: XercesEntityReferenceWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesEntityReferenceWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesEntityReferenceWrapper.hpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -429,7 +429,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
/**
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.cpp
Index: XercesEntityWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesEntityWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesEntityWrapper.cpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -317,7 +317,7 @@
-unsigned long
+XercesEntityWrapper::IndexType
XercesEntityWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.hpp
Index: XercesEntityWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesEntityWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesEntityWrapper.hpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -429,7 +429,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.7 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.cpp
Index: XercesNotationBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesNotationBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
+++ XercesNotationBridge.cpp 12 Feb 2003 23:05:40 -0000 1.7
@@ -306,7 +306,7 @@
-unsigned long
+XercesNotationBridge::IndexType
XercesNotationBridge::getIndex() const
{
return m_navigator.getIndex();
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.hpp
Index: XercesNotationBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesNotationBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesNotationBridge.hpp 12 Feb 2003 23:05:40 -0000 1.9
@@ -436,7 +436,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.cpp
Index: XercesNotationWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesNotationWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesNotationWrapper.cpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -315,7 +315,7 @@
-unsigned long
+XercesNotationWrapper::IndexType
XercesNotationWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.hpp
Index: XercesNotationWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesNotationWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesNotationWrapper.hpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -428,7 +428,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.7 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.cpp
Index: XercesProcessingInstructionBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesProcessingInstructionBridge.cpp 22 Nov 2002 01:12:49 -0000
1.6
+++ XercesProcessingInstructionBridge.cpp 12 Feb 2003 23:05:40 -0000
1.7
@@ -315,7 +315,7 @@
-unsigned long
+XercesProcessingInstructionBridge::IndexType
XercesProcessingInstructionBridge::getIndex() const
{
return m_navigator.getIndex();
1.9 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.hpp
Index: XercesProcessingInstructionBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesProcessingInstructionBridge.hpp 22 Nov 2002 01:12:49 -0000
1.8
+++ XercesProcessingInstructionBridge.hpp 12 Feb 2003 23:05:40 -0000
1.9
@@ -436,7 +436,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp
Index: XercesProcessingInstructionWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesProcessingInstructionWrapper.cpp 22 Nov 2002 01:12:49 -0000
1.2
+++ XercesProcessingInstructionWrapper.cpp 12 Feb 2003 23:05:40 -0000
1.3
@@ -315,7 +315,7 @@
-unsigned long
+XercesProcessingInstructionWrapper::IndexType
XercesProcessingInstructionWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.hpp
Index: XercesProcessingInstructionWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesProcessingInstructionWrapper.hpp 22 Nov 2002 01:12:49 -0000
1.2
+++ XercesProcessingInstructionWrapper.hpp 12 Feb 2003 23:05:40 -0000
1.3
@@ -428,7 +428,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.9 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.cpp
Index: XercesTextBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesTextBridge.cpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesTextBridge.cpp 12 Feb 2003 23:05:40 -0000 1.9
@@ -321,7 +321,7 @@
-unsigned long
+XercesTextBridge::IndexType
XercesTextBridge::getIndex() const
{
return m_navigator.getIndex();
1.9 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.hpp
Index: XercesTextBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesTextBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
+++ XercesTextBridge.hpp 12 Feb 2003 23:05:40 -0000 1.9
@@ -438,7 +438,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.3 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.cpp
Index: XercesTextWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesTextWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesTextWrapper.cpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -318,7 +318,7 @@
-unsigned long
+XercesTextWrapper::IndexType
XercesTextWrapper::getIndex() const
{
return m_navigator.getIndex();
1.3 +1 -1 xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.hpp
Index: XercesTextWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesTextWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
+++ XercesTextWrapper.hpp 12 Feb 2003 23:05:40 -0000 1.3
@@ -429,7 +429,7 @@
virtual bool
isIndexed() const;
- virtual unsigned long
+ virtual IndexType
getIndex() const;
//@}
1.6 +2 -3
xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.cpp
Index: XercesWrapperNavigator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesWrapperNavigator.cpp 20 Dec 2002 01:40:55 -0000 1.5
+++ XercesWrapperNavigator.cpp 12 Feb 2003 23:05:40 -0000 1.6
@@ -79,15 +79,14 @@
XercesWrapperNavigator::XercesWrapperNavigator(
- XercesDocumentWrapper* theOwnerDocument,
- bool mappingMode) :
+ XercesDocumentWrapper* theOwnerDocument) :
m_ownerDocument(theOwnerDocument),
m_parentNode(0),
m_previousSibling(0),
m_nextSibling(0),
m_firstChild(0),
m_lastChild(0),
- m_index(UINT_MAX)
+ m_index(0)
{
assert(theOwnerDocument != 0);
}
1.7 +7 -7
xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.hpp
Index: XercesWrapperNavigator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesWrapperNavigator.hpp 20 Dec 2002 01:40:55 -0000 1.6
+++ XercesWrapperNavigator.hpp 12 Feb 2003 23:05:40 -0000 1.7
@@ -72,6 +72,7 @@
#include <XalanDOM/XalanDOMString.hpp>
+#include <XalanDOM/XalanNode.hpp>
@@ -86,7 +87,6 @@
class XercesDocumentWrapper;
class XalanAttr;
class XalanElement;
-class XalanNode;
class XalanText;
@@ -95,10 +95,10 @@
{
public:
+ typedef XalanNode::IndexType IndexType;
+
explicit
- XercesWrapperNavigator(
- XercesDocumentWrapper* theOwnerDocument = 0,
- bool mappingMode =
true);
+ XercesWrapperNavigator(XercesDocumentWrapper* theOwnerDocument = 0);
XercesWrapperNavigator(const XercesWrapperNavigator& theSource);
@@ -127,14 +127,14 @@
const DOMNodeType*
mapNode(XalanNode* theXalanNode) const;
- unsigned long
+ IndexType
getIndex() const
{
return m_index;
}
void
- setIndex(unsigned long theIndex)
+ setIndex(IndexType theIndex)
{
m_index = theIndex;
}
@@ -246,7 +246,7 @@
XalanNode* m_lastChild;
- unsigned long m_index;
+ IndexType m_index;
static const XalanDOMString s_emptyString;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
