dbertoni 2003/02/12 17:27:07
Modified: c/src/XalanExtensions FunctionDifference.hpp
FunctionDistinct.hpp FunctionEvaluate.hpp
FunctionHasSameNodes.hpp FunctionIntersection.hpp
FunctionNodeSet.hpp
Log:
Added using declaration.
Revision Changes Path
1.5 +7 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionDifference.hpp 25 Nov 2002 19:07:13 -0000 1.4
+++ FunctionDifference.hpp 13 Feb 2003 01:27:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionDifference();
virtual
~FunctionDifference();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.5 +7 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionDistinct.hpp 25 Nov 2002 19:07:13 -0000 1.4
+++ FunctionDistinct.hpp 13 Feb 2003 01:27:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionDistinct();
virtual
~FunctionDistinct();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.5 +7 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionEvaluate.hpp 25 Nov 2002 19:07:13 -0000 1.4
+++ FunctionEvaluate.hpp 13 Feb 2003 01:27:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionEvaluate();
virtual
~FunctionEvaluate();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.5 +7 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionHasSameNodes.hpp 25 Nov 2002 19:07:13 -0000 1.4
+++ FunctionHasSameNodes.hpp 13 Feb 2003 01:27:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionHasSameNodes();
virtual
~FunctionHasSameNodes();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.5 +7 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionIntersection.hpp 25 Nov 2002 19:07:13 -0000 1.4
+++ FunctionIntersection.hpp 13 Feb 2003 01:27:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionIntersection();
virtual
~FunctionIntersection();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.7 +7 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionNodeSet.hpp 25 Nov 2002 19:07:13 -0000 1.6
+++ FunctionNodeSet.hpp 13 Feb 2003 01:27:07 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,6 +84,8 @@
{
public:
+ typedef Function ParentType;
+
/**
* Constructor.
*
@@ -95,6 +97,10 @@
~FunctionNodeSet();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
