dbertoni 2003/11/24 16:49:04
Modified: c/src/xalanc/XalanEXSLT XalanEXSLTDynamicImpl.hpp
c/src/xalanc/XalanExtensions FunctionEvaluate.hpp
Log:
Patch for Bugzilla 24953.
Revision Changes Path
1.3 +5 -5
xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp
Index: XalanEXSLTDynamicImpl.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanEXSLTDynamicImpl.hpp 19 Sep 2003 21:05:33 -0000 1.2
+++ XalanEXSLTDynamicImpl.hpp 25 Nov 2003 00:49:04 -0000 1.3
@@ -92,16 +92,16 @@
{
}
- XObjectPtr
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
+
+ virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
XalanNode*
context,
const XObjectArgVectorType& args,
const LocatorType*
locator) const;
-
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.3 +4 -4
xml-xalan/c/src/xalanc/XalanExtensions/FunctionEvaluate.hpp
Index: FunctionEvaluate.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanExtensions/FunctionEvaluate.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionEvaluate.hpp 19 Sep 2003 21:05:34 -0000 1.2
+++ FunctionEvaluate.hpp 25 Nov 2003 00:49:04 -0000 1.3
@@ -87,6 +87,10 @@
virtual
~FunctionEvaluate();
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
+
// These methods are inherited from Function ...
virtual XObjectPtr
@@ -95,10 +99,6 @@
XalanNode*
context,
const XObjectArgVectorType& args,
const LocatorType*
locator) const;
-
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
