dbertoni 2003/02/12 18:18:14
Modified: c/src/XPath FunctionConcat.hpp FunctionContains.hpp
FunctionID.hpp FunctionLang.hpp
FunctionNamespaceURI.hpp FunctionNormalizeSpace.hpp
FunctionStartsWith.hpp FunctionString.hpp
FunctionSubstring.hpp FunctionSubstringAfter.hpp
FunctionSubstringBefore.hpp FunctionTranslate.hpp
Log:
Moved using declaration after function declarations.
Revision Changes Path
1.12 +4 -4 xml-xalan/c/src/XPath/FunctionConcat.hpp
Index: FunctionConcat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionConcat.hpp 13 Feb 2003 01:27:23 -0000 1.11
+++ FunctionConcat.hpp 13 Feb 2003 02:18:12 -0000 1.12
@@ -89,10 +89,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -116,6 +112,10 @@
const XObjectPtr arg2,
const XObjectPtr arg3,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.14 +4 -4 xml-xalan/c/src/XPath/FunctionContains.hpp
Index: FunctionContains.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionContains.hpp 13 Feb 2003 01:27:23 -0000 1.13
+++ FunctionContains.hpp 13 Feb 2003 02:18:12 -0000 1.14
@@ -89,10 +89,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -100,6 +96,10 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.25 +4 -4 xml-xalan/c/src/XPath/FunctionID.hpp
Index: FunctionID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- FunctionID.hpp 13 Feb 2003 01:27:23 -0000 1.24
+++ FunctionID.hpp 13 Feb 2003 02:18:12 -0000 1.25
@@ -110,16 +110,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 XObjectPtr arg1,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.17 +4 -4 xml-xalan/c/src/XPath/FunctionLang.hpp
Index: FunctionLang.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FunctionLang.hpp 13 Feb 2003 01:27:23 -0000 1.16
+++ FunctionLang.hpp 13 Feb 2003 02:18:12 -0000 1.17
@@ -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 XObjectPtr arg1,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.17 +4 -4 xml-xalan/c/src/XPath/FunctionNamespaceURI.hpp
Index: FunctionNamespaceURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FunctionNamespaceURI.hpp 13 Feb 2003 01:27:23 -0000 1.16
+++ FunctionNamespaceURI.hpp 13 Feb 2003 02:18:12 -0000 1.17
@@ -97,10 +97,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -113,6 +109,10 @@
XalanNode* context,
const XObjectPtr arg1,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.10 +4 -4 xml-xalan/c/src/XPath/FunctionNormalizeSpace.hpp
Index: FunctionNormalizeSpace.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionNormalizeSpace.hpp 13 Feb 2003 01:27:23 -0000 1.9
+++ FunctionNormalizeSpace.hpp 13 Feb 2003 02:18:12 -0000 1.10
@@ -93,10 +93,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -109,6 +105,10 @@
XalanNode* context,
const XObjectPtr arg1,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.11 +4 -4 xml-xalan/c/src/XPath/FunctionStartsWith.hpp
Index: FunctionStartsWith.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStartsWith.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionStartsWith.hpp 13 Feb 2003 01:27:23 -0000 1.10
+++ FunctionStartsWith.hpp 13 Feb 2003 02:18:12 -0000 1.11
@@ -89,10 +89,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -100,6 +96,10 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.15 +4 -4 xml-xalan/c/src/XPath/FunctionString.hpp
Index: FunctionString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionString.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionString.hpp 13 Feb 2003 01:27:23 -0000 1.14
+++ FunctionString.hpp 13 Feb 2003 02:18:12 -0000 1.15
@@ -97,10 +97,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -113,6 +109,10 @@
XalanNode* context,
const XObjectPtr arg1,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.15 +4 -4 xml-xalan/c/src/XPath/FunctionSubstring.hpp
Index: FunctionSubstring.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionSubstring.hpp 13 Feb 2003 01:27:23 -0000 1.14
+++ FunctionSubstring.hpp 13 Feb 2003 02:18:12 -0000 1.15
@@ -97,10 +97,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -117,6 +113,10 @@
const XObjectPtr arg2,
const XObjectPtr arg3,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.13 +4 -4 xml-xalan/c/src/XPath/FunctionSubstringAfter.hpp
Index: FunctionSubstringAfter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionSubstringAfter.hpp 13 Feb 2003 01:27:23 -0000 1.12
+++ FunctionSubstringAfter.hpp 13 Feb 2003 02:18:12 -0000 1.13
@@ -89,10 +89,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -100,6 +96,10 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.13 +4 -4 xml-xalan/c/src/XPath/FunctionSubstringBefore.hpp
Index: FunctionSubstringBefore.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionSubstringBefore.hpp 13 Feb 2003 01:27:23 -0000 1.12
+++ FunctionSubstringBefore.hpp 13 Feb 2003 02:18:12 -0000 1.13
@@ -89,10 +89,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -100,6 +96,10 @@
const XObjectPtr arg1,
const XObjectPtr arg2,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.14 +4 -4 xml-xalan/c/src/XPath/FunctionTranslate.hpp
Index: FunctionTranslate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionTranslate.hpp 13 Feb 2003 01:27:23 -0000 1.13
+++ FunctionTranslate.hpp 13 Feb 2003 02:18:12 -0000 1.14
@@ -89,10 +89,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -101,6 +97,10 @@
const XObjectPtr arg2,
const XObjectPtr arg3,
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]
