dbertoni 2003/02/12 18:47:25
Modified: c/src/XalanEXSLT XalanEXSLTCommonImpl.hpp
XalanEXSLTMathImpl.hpp XalanEXSLTSetImpl.hpp
XalanEXSLTStringImpl.hpp
Log:
Moved using declaration after function declarations.
Revision Changes Path
1.6 +4 -4 xml-xalan/c/src/XalanEXSLT/XalanEXSLTCommonImpl.hpp
Index: XalanEXSLTCommonImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTCommonImpl.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanEXSLTCommonImpl.hpp 13 Feb 2003 01:26:59 -0000 1.5
+++ XalanEXSLTCommonImpl.hpp 13 Feb 2003 02:47:24 -0000 1.6
@@ -161,16 +161,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.5 +68 -68 xml-xalan/c/src/XalanEXSLT/XalanEXSLTMathImpl.hpp
Index: XalanEXSLTMathImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTMathImpl.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanEXSLTMathImpl.hpp 13 Feb 2003 01:26:59 -0000 1.4
+++ XalanEXSLTMathImpl.hpp 13 Feb 2003 02:47:24 -0000 1.5
@@ -88,10 +88,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -99,6 +95,10 @@
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*
#else
@@ -143,10 +143,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -154,6 +150,10 @@
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*
#else
@@ -198,10 +198,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -209,6 +205,10 @@
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*
#else
@@ -253,10 +253,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -264,6 +260,10 @@
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*
#else
@@ -308,10 +308,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -319,6 +315,10 @@
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*
#else
@@ -363,10 +363,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -374,6 +370,10 @@
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*
#else
@@ -438,10 +438,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -449,6 +445,10 @@
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*
#else
@@ -493,10 +493,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -504,6 +500,10 @@
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*
#else
@@ -548,10 +548,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -559,6 +555,10 @@
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*
#else
@@ -603,10 +603,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -614,6 +610,10 @@
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*
#else
@@ -658,10 +658,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -669,6 +665,10 @@
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*
#else
@@ -713,10 +713,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -724,6 +720,10 @@
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*
#else
@@ -768,10 +768,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -779,6 +775,10 @@
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*
#else
@@ -823,10 +823,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -834,6 +830,10 @@
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*
#else
@@ -878,10 +878,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -889,6 +885,10 @@
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*
#else
@@ -933,10 +933,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -944,6 +940,10 @@
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*
#else
@@ -988,16 +988,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.4 +12 -12 xml-xalan/c/src/XalanEXSLT/XalanEXSLTSetImpl.hpp
Index: XalanEXSLTSetImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTSetImpl.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanEXSLTSetImpl.hpp 13 Feb 2003 01:26:59 -0000 1.3
+++ XalanEXSLTSetImpl.hpp 13 Feb 2003 02:47:24 -0000 1.4
@@ -183,10 +183,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -194,6 +190,10 @@
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*
#else
@@ -286,10 +286,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -297,6 +293,10 @@
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*
#else
@@ -345,16 +345,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 +12 -12 xml-xalan/c/src/XalanEXSLT/XalanEXSLTStringImpl.hpp
Index: XalanEXSLTStringImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanEXSLT/XalanEXSLTStringImpl.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanEXSLTStringImpl.hpp 13 Feb 2003 01:26:59 -0000 1.5
+++ XalanEXSLTStringImpl.hpp 13 Feb 2003 02:47:24 -0000 1.6
@@ -88,10 +88,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -99,6 +95,10 @@
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*
#else
@@ -152,10 +152,6 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::execute;
-#endif
-
virtual XObjectPtr
execute(
XPathExecutionContext&
executionContext,
@@ -163,6 +159,10 @@
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*
#else
@@ -219,16 +219,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]
