dbertoni 2003/02/12 17:27:24
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
XNumberBase.hpp
Log:
Added using declaration.
Revision Changes Path
1.11 +6 -0 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionConcat.hpp 21 Nov 2002 01:26:17 -0000 1.10
+++ FunctionConcat.hpp 13 Feb 2003 01:27:23 -0000 1.11
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionConcat();
virtual
~FunctionConcat();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.13 +7 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionContains.hpp 21 Nov 2002 01:26:17 -0000 1.12
+++ FunctionContains.hpp 13 Feb 2003 01:27:23 -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
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionContains();
virtual
~FunctionContains();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
XObjectPtr
execute(
1.24 +7 -1 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FunctionID.hpp 24 Jan 2003 02:32:37 -0000 1.23
+++ FunctionID.hpp 13 Feb 2003 01:27:23 -0000 1.24
@@ -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
@@ -101,12 +101,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionID();
virtual
~FunctionID();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.16 +7 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FunctionLang.hpp 21 Nov 2002 01:26:17 -0000 1.15
+++ FunctionLang.hpp 13 Feb 2003 01:27:23 -0000 1.16
@@ -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,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionLang();
virtual
~FunctionLang();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.16 +7 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FunctionNamespaceURI.hpp 21 Nov 2002 01:26:17 -0000 1.15
+++ FunctionNamespaceURI.hpp 13 Feb 2003 01:27:23 -0000 1.16
@@ -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,12 +88,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionNamespaceURI();
virtual
~FunctionNamespaceURI();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.9 +7 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionNormalizeSpace.hpp 21 Nov 2002 01:26:17 -0000 1.8
+++ FunctionNormalizeSpace.hpp 13 Feb 2003 01:27:23 -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
@@ -84,12 +84,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionNormalizeSpace();
virtual
~FunctionNormalizeSpace();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.10 +7 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionStartsWith.hpp 21 Nov 2002 01:26:17 -0000 1.9
+++ FunctionStartsWith.hpp 13 Feb 2003 01:27:23 -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
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionStartsWith();
virtual
~FunctionStartsWith();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.14 +7 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionString.hpp 21 Nov 2002 01:26:17 -0000 1.13
+++ FunctionString.hpp 13 Feb 2003 01:27:23 -0000 1.14
@@ -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,12 +88,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionString();
virtual
~FunctionString();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.14 +7 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionSubstring.hpp 11 Feb 2003 02:31:53 -0000 1.13
+++ FunctionSubstring.hpp 13 Feb 2003 01:27:23 -0000 1.14
@@ -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,12 +88,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionSubstring();
virtual
~FunctionSubstring();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.12 +7 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSubstringAfter.hpp 21 Nov 2002 01:26:18 -0000 1.11
+++ FunctionSubstringAfter.hpp 13 Feb 2003 01:27:23 -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,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionSubstringAfter();
virtual
~FunctionSubstringAfter();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.12 +7 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionSubstringBefore.hpp 21 Nov 2002 01:26:18 -0000 1.11
+++ FunctionSubstringBefore.hpp 13 Feb 2003 01:27:23 -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,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionSubstringBefore();
virtual
~FunctionSubstringBefore();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.13 +7 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionTranslate.hpp 21 Nov 2002 01:26:18 -0000 1.12
+++ FunctionTranslate.hpp 13 Feb 2003 01:27:23 -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
@@ -80,12 +80,18 @@
{
public:
+ typedef Function ParentType;
+
FunctionTranslate();
virtual
~FunctionTranslate();
// These methods are inherited from Function ...
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
virtual XObjectPtr
execute(
1.5 +6 -0 xml-xalan/c/src/XPath/XNumberBase.hpp
Index: XNumberBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberBase.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XNumberBase.hpp 21 Nov 2002 01:26:18 -0000 1.4
+++ XNumberBase.hpp 13 Feb 2003 01:27:23 -0000 1.5
@@ -81,6 +81,8 @@
{
public:
+ typedef XObject ParentType;
+
XNumberBase(const XNumberBase& source);
virtual
@@ -96,6 +98,10 @@
virtual bool
boolean() const;
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::str;
+#endif
virtual const XalanDOMString&
str() const = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
