dbertoni 2003/07/17 10:57:25
Modified: c/src/xalanc/XPath FunctionNamespaceURI.hpp
FunctionSubstring.hpp XStringBase.hpp
Log:
Changes for Win64. Fixes bugzilla 20747.
Revision Changes Path
1.2 +4 -4 xml-xalan/c/src/xalanc/XPath/FunctionNamespaceURI.hpp
Index: FunctionNamespaceURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/FunctionNamespaceURI.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionNamespaceURI.hpp 29 Jun 2003 03:58:00 -0000 1.1
+++ FunctionNamespaceURI.hpp 17 Jul 2003 17:57:25 -0000 1.2
@@ -97,6 +97,10 @@
// These methods are inherited from Function ...
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
+
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -109,10 +113,6 @@
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.2 +4 -4 xml-xalan/c/src/xalanc/XPath/FunctionSubstring.hpp
Index: FunctionSubstring.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/FunctionSubstring.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionSubstring.hpp 29 Jun 2003 03:58:00 -0000 1.1
+++ FunctionSubstring.hpp 17 Jul 2003 17:57:25 -0000 1.2
@@ -97,6 +97,10 @@
// These methods are inherited from Function ...
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::execute;
+#endif
+
virtual XObjectPtr
execute(
XPathExecutionContext& executionContext,
@@ -113,10 +117,6 @@
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.2 +4 -4 xml-xalan/c/src/xalanc/XPath/XStringBase.hpp
Index: XStringBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XStringBase.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XStringBase.hpp 29 Jun 2003 03:58:01 -0000 1.1
+++ XStringBase.hpp 17 Jul 2003 17:57:25 -0000 1.2
@@ -114,6 +114,10 @@
virtual bool
boolean() const;
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using ParentType::str;
+#endif
+
virtual const XalanDOMString&
str() const = 0;
@@ -121,10 +125,6 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const = 0;
-
-#if !defined(XALAN_NO_USING_DECLARATION)
- using ParentType::str;
-#endif
virtual double
stringLength() const = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
