dbertoni 01/07/21 21:31:55
Modified: c/src/XSLT ElemCopyOf.cpp ElemCopyOf.hpp
Log:
Renamed functions due to collision with XalanElement::cloneNode().
Revision Changes Path
1.21 +20 -19 xml-xalan/c/src/XSLT/ElemCopyOf.cpp
Index: ElemCopyOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemCopyOf.cpp 2001/07/18 04:33:15 1.20
+++ ElemCopyOf.cpp 2001/07/22 04:31:54 1.21
@@ -139,24 +139,8 @@
inline void
-ElemCopyOf::cloneNodeSet(
+ElemCopyOf::doCloneNode(
StylesheetExecutionContext& executionContext,
- const NodeRefListBase& theNodeList) const
-{
- unsigned int nChildren = theNodeList.getLength();
-
- for(unsigned int i = 0; i < nChildren; i++)
- {
- assert(theNodeList.item(i) != 0);
- cloneNode(executionContext, *theNodeList.item(i));
- }
-}
-
-
-
-inline void
-ElemCopyOf::cloneNode(
- StylesheetExecutionContext& executionContext,
XalanNode&
theNode) const
{
XalanNode* pos = &theNode;
@@ -211,6 +195,23 @@
+inline void
+ElemCopyOf::doCloneNodeSet(
+ StylesheetExecutionContext& executionContext,
+ const NodeRefListBase& theNodeList) const
+{
+ unsigned int nChildren = theNodeList.getLength();
+
+ for(unsigned int i = 0; i < nChildren; i++)
+ {
+ assert(theNodeList.item(i) != 0);
+
+ doCloneNode(executionContext, *theNodeList.item(i));
+ }
+}
+
+
+
void
ElemCopyOf::execute(StylesheetExecutionContext& executionContext) const
{
@@ -235,7 +236,7 @@
XObjectPtr()));
}
- cloneNode(executionContext, *sourceNode);
+ doCloneNode(executionContext, *sourceNode);
}
else
{
@@ -265,7 +266,7 @@
break;
case XObject::eTypeNodeSet:
- cloneNodeSet(executionContext, value->nodeset());
+ doCloneNodeSet(executionContext, value->nodeset());
break;
case XObject::eTypeResultTreeFrag:
1.11 +5 -5 xml-xalan/c/src/XSLT/ElemCopyOf.hpp
Index: ElemCopyOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemCopyOf.hpp 2001/07/08 18:41:22 1.10
+++ ElemCopyOf.hpp 2001/07/22 04:31:54 1.11
@@ -58,7 +58,7 @@
#define XALAN_ELEMCOPYOF_HEADER_GUARD
/**
- * $Id: ElemCopyOf.hpp,v 1.10 2001/07/08 18:41:22 dbertoni Exp $
+ * $Id: ElemCopyOf.hpp,v 1.11 2001/07/22 04:31:54 dbertoni Exp $
*
*
* $State: Exp $
@@ -112,14 +112,14 @@
private:
void
- cloneNodeSet(
+ doCloneNode(
StylesheetExecutionContext& executionContext,
- const NodeRefListBase& theNodeList) const;
+ XalanNode&
theNode) const;
void
- cloneNode(
+ doCloneNodeSet(
StylesheetExecutionContext& executionContext,
- XalanNode&
theNode) const;
+ const NodeRefListBase& theNodeList) const;
const XPath* m_selectPattern;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
