dbertoni 01/03/29 14:16:35
Modified: c/src/XPath XResultTreeFrag.cpp XResultTreeFrag.hpp
Log:
Disabled auto-conversion to nodeset.
Revision Changes Path
1.19 +12 -4 xml-xalan/c/src/XPath/XResultTreeFrag.cpp
Index: XResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XResultTreeFrag.cpp 2001/01/16 02:32:39 1.18
+++ XResultTreeFrag.cpp 2001/03/29 22:16:35 1.19
@@ -83,8 +83,10 @@
XObject(eTypeResultTreeFrag),
m_value(val),
m_cachedStringValue(),
- m_cachedNumberValue(0.0),
- m_nodeRefListBaseProxy(*this)
+ m_cachedNumberValue(0.0)
+#if XALAN_RTREEFRAG_TO_NODESET_CONVERSION
+ , m_nodeRefListBaseProxy(*this)
+#endif
{
}
@@ -96,8 +98,10 @@
XObject(source),
m_value(source.m_value.clone(deepClone)),
m_cachedStringValue(source.m_cachedStringValue),
- m_cachedNumberValue(source.m_cachedNumberValue),
- m_nodeRefListBaseProxy(*this)
+ m_cachedNumberValue(source.m_cachedNumberValue)
+#if XALAN_RTREEFRAG_TO_NODESET_CONVERSION
+ , m_nodeRefListBaseProxy(*this)
+#endif
{
}
@@ -191,7 +195,11 @@
const NodeRefListBase&
XResultTreeFrag::nodeset() const
{
+#if XALAN_RTREEFRAG_TO_NODESET_CONVERSION
return m_nodeRefListBaseProxy;
+#else
+ return ParentType::nodeset();
+#endif
}
1.20 +3 -0 xml-xalan/c/src/XPath/XResultTreeFrag.hpp
Index: XResultTreeFrag.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XResultTreeFrag.hpp 2001/01/25 17:14:22 1.19
+++ XResultTreeFrag.hpp 2001/03/29 22:16:35 1.20
@@ -96,6 +96,7 @@
{
public:
+ typedef XObject
ParentType;
typedef XPathExecutionContext::BorrowReturnResultTreeFrag
BorrowReturnResultTreeFrag;
@@ -200,7 +201,9 @@
mutable double m_cachedNumberValue;
+#if XALAN_RTREEFRAG_TO_NODESET_CONVERSION
const NodeRefListBaseProxy m_nodeRefListBaseProxy;
+#endif
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
