dbertoni 2003/02/12 18:44:45
Modified: c/src/XSLT FunctionCurrent.hpp FunctionDocument.hpp
FunctionElementAvailable.hpp
FunctionFormatNumber.hpp
FunctionFunctionAvailable.hpp
FunctionGenerateID.hpp FunctionKey.hpp
FunctionSystemProperty.hpp
FunctionUnparsedEntityURI.hpp
Log:
Added using declaration.
Revision Changes Path
1.10 +7 -1 xml-xalan/c/src/XSLT/FunctionCurrent.hpp
Index: FunctionCurrent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionCurrent.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionCurrent.hpp 25 Nov 2002 18:11:52 -0000 1.9
+++ FunctionCurrent.hpp 13 Feb 2003 02:44:45 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionCurrent();
virtual
@@ -100,6 +102,10 @@
XPathExecutionContext& executionContext,
XalanNode* context,
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 +7 -1 xml-xalan/c/src/XSLT/FunctionDocument.hpp
Index: FunctionDocument.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionDocument.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionDocument.hpp 25 Nov 2002 18:11:52 -0000 1.9
+++ FunctionDocument.hpp 13 Feb 2003 02:44:45 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionDocument();
virtual
@@ -99,6 +101,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.7 +7 -1 xml-xalan/c/src/XSLT/FunctionElementAvailable.hpp
Index: FunctionElementAvailable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionElementAvailable.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionElementAvailable.hpp 25 Nov 2002 18:11:52 -0000 1.6
+++ FunctionElementAvailable.hpp 13 Feb 2003 02:44:45 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionElementAvailable();
virtual
@@ -101,6 +103,10 @@
XalanNode* context,
const XObjectPtr arg,
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 +7 -1 xml-xalan/c/src/XSLT/FunctionFormatNumber.hpp
Index: FunctionFormatNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFormatNumber.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionFormatNumber.hpp 25 Nov 2002 18:11:52 -0000 1.12
+++ FunctionFormatNumber.hpp 13 Feb 2003 02:44:45 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -96,6 +96,8 @@
{
public:
+ typedef Function ParentType;
+
/**
* Perform static initialization. See class XSLTInit.
*/
@@ -131,6 +133,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.9 +7 -1 xml-xalan/c/src/XSLT/FunctionFunctionAvailable.hpp
Index: FunctionFunctionAvailable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFunctionAvailable.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionFunctionAvailable.hpp 12 Dec 2002 22:24:56 -0000 1.8
+++ FunctionFunctionAvailable.hpp 13 Feb 2003 02:44:45 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionFunctionAvailable();
virtual
@@ -101,6 +103,10 @@
XalanNode* context,
const XObjectPtr arg,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.12 +7 -1 xml-xalan/c/src/XSLT/FunctionGenerateID.hpp
Index: FunctionGenerateID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionGenerateID.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionGenerateID.hpp 25 Nov 2002 18:11:52 -0000 1.11
+++ FunctionGenerateID.hpp 13 Feb 2003 02:44:45 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,6 +80,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionGenerateID();
virtual
@@ -99,6 +101,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 +7 -1 xml-xalan/c/src/XSLT/FunctionKey.hpp
Index: FunctionKey.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionKey.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionKey.hpp 25 Nov 2002 18:11:52 -0000 1.10
+++ FunctionKey.hpp 13 Feb 2003 02:44:45 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -87,6 +87,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionKey();
virtual
@@ -101,6 +103,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.10 +7 -1 xml-xalan/c/src/XSLT/FunctionSystemProperty.hpp
Index: FunctionSystemProperty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionSystemProperty.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionSystemProperty.hpp 25 Nov 2002 18:11:52 -0000 1.9
+++ FunctionSystemProperty.hpp 13 Feb 2003 02:44:45 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,6 +78,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionSystemProperty();
virtual
@@ -91,6 +93,10 @@
XalanNode* context,
const XObjectPtr arg,
const LocatorType* locator) const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.9 +6 -0 xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.hpp
Index: FunctionUnparsedEntityURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionUnparsedEntityURI.hpp 25 Nov 2002 18:11:52 -0000 1.8
+++ FunctionUnparsedEntityURI.hpp 13 Feb 2003 02:44:45 -0000 1.9
@@ -83,6 +83,8 @@
{
public:
+ typedef Function ParentType;
+
FunctionUnparsedEntityURI();
virtual
@@ -96,6 +98,10 @@
XalanNode* context,
const XObjectPtr arg,
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]
