dbertoni 2003/02/12 18:37:44
Modified: c/src/XalanExtensions FunctionDifference.hpp
FunctionDistinct.hpp FunctionEvaluate.hpp
FunctionHasSameNodes.hpp FunctionIntersection.hpp
FunctionNodeSet.hpp
Log:
Moved using declaration after function declarations.
Revision Changes Path
1.6 +4 -4 xml-xalan/c/src/XalanExtensions/FunctionDifference.hpp
Index: FunctionDifference.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionDifference.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionDifference.hpp 13 Feb 2003 01:27:07 -0000 1.5
+++ FunctionDifference.hpp 13 Feb 2003 02:37:44 -0000 1.6
@@ -89,16 +89,16 @@
// These methods are inherited from Function ...
-#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.6 +4 -4 xml-xalan/c/src/XalanExtensions/FunctionDistinct.hpp
Index: FunctionDistinct.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionDistinct.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionDistinct.hpp 13 Feb 2003 01:27:07 -0000 1.5
+++ FunctionDistinct.hpp 13 Feb 2003 02:37:44 -0000 1.6
@@ -89,16 +89,16 @@
// These methods are inherited from Function ...
-#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.6 +4 -4 xml-xalan/c/src/XalanExtensions/FunctionEvaluate.hpp
Index: FunctionEvaluate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionEvaluate.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionEvaluate.hpp 13 Feb 2003 01:27:07 -0000 1.5
+++ FunctionEvaluate.hpp 13 Feb 2003 02:37:44 -0000 1.6
@@ -89,16 +89,16 @@
// These methods are inherited from Function ...
-#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.6 +4 -4 xml-xalan/c/src/XalanExtensions/FunctionHasSameNodes.hpp
Index: FunctionHasSameNodes.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionHasSameNodes.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionHasSameNodes.hpp 13 Feb 2003 01:27:07 -0000 1.5
+++ FunctionHasSameNodes.hpp 13 Feb 2003 02:37:44 -0000 1.6
@@ -89,16 +89,16 @@
// These methods are inherited from Function ...
-#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.6 +4 -4 xml-xalan/c/src/XalanExtensions/FunctionIntersection.hpp
Index: FunctionIntersection.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionIntersection.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionIntersection.hpp 13 Feb 2003 01:27:07 -0000 1.5
+++ FunctionIntersection.hpp 13 Feb 2003 02:37:44 -0000 1.6
@@ -89,16 +89,16 @@
// These methods are inherited from Function ...
-#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.8 +4 -4 xml-xalan/c/src/XalanExtensions/FunctionNodeSet.hpp
Index: FunctionNodeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanExtensions/FunctionNodeSet.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionNodeSet.hpp 13 Feb 2003 01:27:07 -0000 1.7
+++ FunctionNodeSet.hpp 13 Feb 2003 02:37:44 -0000 1.8
@@ -98,16 +98,16 @@
// These methods are inherited from Function ...
-#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*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
