You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/09/14 23:03:16 UTC
svn commit: r695287 - in /xalan/c/trunk: samples/ExternalFunction/
src/xalanc/Include/ src/xalanc/XPath/ src/xalanc/XSLT/
src/xalanc/XalanEXSLT/ src/xalanc/XalanExtensions/
src/xalanc/XercesParserLiaison/
Author: dbertoni
Date: Sun Sep 14 14:03:15 2008
New Revision: 695287
URL: http://svn.apache.org/viewvc?rev=695287&view=rev
Log:
Removed some obsolete defines.
Modified:
xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp
xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp
xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp
xalan/c/trunk/src/xalanc/XPath/XStringBase.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp
xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp
xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
Modified: xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp (original)
+++ xalan/c/trunk/samples/ExternalFunction/ExternalFunction.cpp Sun Sep 14 14:03:15 2008
@@ -92,9 +92,7 @@
return executionContext.getXObjectFactory().createNumber(sqrt(args[0]->num(executionContext)));
}
-#if !defined(XALAN_NO_USING_DECLARATION)
using Function::execute;
-#endif
/**
* Create a copy of the function object.
@@ -181,9 +179,7 @@
return executionContext.getXObjectFactory().createNumber(pow(args[0]->num(executionContext), 3));
}
-#if !defined(XALAN_NO_USING_DECLARATION)
using Function::execute;
-#endif
/**
* Create a copy of the function object.
@@ -281,9 +277,7 @@
return executionContext.getXObjectFactory().createString(XalanDOMString(theTimeString));
}
-#if !defined(XALAN_NO_USING_DECLARATION)
using Function::execute;
-#endif
/**
* Create a copy of the function object.
Modified: xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp Sun Sep 14 14:03:15 2008
@@ -33,11 +33,6 @@
-#if __GNUC__ < 3
-#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_STD_ALLOCATORS
-#endif
-
#define XALAN_SGI_BASED_STL
#define XALAN_POSIX2_AVAILABLE
#define XALAN_INLINE_INITIALIZATION
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionConcat.hpp Sun Sep 14 14:03:15 2008
@@ -74,9 +74,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionContains.hpp Sun Sep 14 14:03:15 2008
@@ -58,9 +58,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionID.hpp Sun Sep 14 14:03:15 2008
@@ -74,9 +74,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionLang.hpp Sun Sep 14 14:03:15 2008
@@ -70,9 +70,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNamespaceURI.hpp Sun Sep 14 14:03:15 2008
@@ -58,9 +58,7 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::execute;
-#endif
virtual XObjectPtr
execute(
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.hpp Sun Sep 14 14:03:15 2008
@@ -67,9 +67,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionStartsWith.hpp Sun Sep 14 14:03:15 2008
@@ -58,9 +58,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionString.hpp Sun Sep 14 14:03:15 2008
@@ -71,9 +71,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.hpp Sun Sep 14 14:03:15 2008
@@ -58,9 +58,7 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::execute;
-#endif
virtual XObjectPtr
execute(
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.hpp Sun Sep 14 14:03:15 2008
@@ -58,9 +58,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringBefore.hpp Sun Sep 14 14:03:15 2008
@@ -58,9 +58,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.hpp Sun Sep 14 14:03:15 2008
@@ -59,9 +59,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XBoolean.hpp Sun Sep 14 14:03:15 2008
@@ -99,9 +99,7 @@
virtual void
str(XalanDOMString& theBuffer) const;
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::str;
-#endif
virtual double
stringLength(XPathExecutionContext& executionContext) const;
Modified: xalan/c/trunk/src/xalanc/XPath/XStringBase.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XStringBase.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XStringBase.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XStringBase.hpp Sun Sep 14 14:03:15 2008
@@ -87,9 +87,7 @@
virtual bool
boolean(XPathExecutionContext& executionContext) const;
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::str;
-#endif
virtual const XalanDOMString&
str(XPathExecutionContext& executionContext) const = 0;
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.hpp Sun Sep 14 14:03:15 2008
@@ -104,9 +104,7 @@
const ElemTemplateElement* theTemplate,
XalanNode* child) const;
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::transformChild;
-#endif
virtual void
selectAndSortChildren(
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp Sun Sep 14 14:03:15 2008
@@ -59,9 +59,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp Sun Sep 14 14:03:15 2008
@@ -63,9 +63,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp Sun Sep 14 14:03:15 2008
@@ -60,9 +60,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp Sun Sep 14 14:03:15 2008
@@ -63,9 +63,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp Sun Sep 14 14:03:15 2008
@@ -60,9 +60,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp Sun Sep 14 14:03:15 2008
@@ -50,9 +50,7 @@
// These methods are inherited from Function ...
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::execute;
-#endif
virtual XObjectPtr
execute(
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp Sun Sep 14 14:03:15 2008
@@ -61,9 +61,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp Sun Sep 14 14:03:15 2008
@@ -57,9 +57,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp Sun Sep 14 14:03:15 2008
@@ -56,9 +56,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTCommonImpl.hpp Sun Sep 14 14:03:15 2008
@@ -144,9 +144,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDateTimeImpl.hpp Sun Sep 14 14:03:15 2008
@@ -56,9 +56,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTDynamicImpl.hpp Sun Sep 14 14:03:15 2008
@@ -56,9 +56,7 @@
{
}
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::execute;
-#endif
virtual XObjectPtr
execute(
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTMathImpl.hpp Sun Sep 14 14:03:15 2008
@@ -60,9 +60,7 @@
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*
@@ -115,9 +113,7 @@
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*
@@ -170,9 +166,7 @@
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*
@@ -225,9 +219,7 @@
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*
@@ -280,9 +272,7 @@
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*
@@ -335,9 +325,7 @@
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*
@@ -390,9 +378,7 @@
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*
@@ -468,9 +454,7 @@
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*
@@ -523,9 +507,7 @@
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*
@@ -578,9 +560,7 @@
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*
@@ -633,9 +613,7 @@
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*
@@ -688,9 +666,7 @@
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*
@@ -743,9 +719,7 @@
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*
@@ -798,9 +772,7 @@
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*
@@ -853,9 +825,7 @@
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*
@@ -908,9 +878,7 @@
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*
@@ -963,9 +931,7 @@
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*
@@ -1018,9 +984,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTSetImpl.hpp Sun Sep 14 14:03:15 2008
@@ -162,9 +162,7 @@
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*
@@ -273,9 +271,7 @@
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*
@@ -335,9 +331,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanEXSLT/XalanEXSLTStringImpl.hpp Sun Sep 14 14:03:15 2008
@@ -61,9 +61,7 @@
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*
@@ -128,9 +126,7 @@
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*
@@ -208,9 +204,7 @@
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*
@@ -277,9 +271,7 @@
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*
@@ -350,9 +342,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDifference.hpp Sun Sep 14 14:03:15 2008
@@ -57,9 +57,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.hpp Sun Sep 14 14:03:15 2008
@@ -57,9 +57,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.hpp Sun Sep 14 14:03:15 2008
@@ -48,9 +48,7 @@
virtual
~FunctionEvaluate();
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::execute;
-#endif
// These methods are inherited from Function ...
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionHasSameNodes.hpp Sun Sep 14 14:03:15 2008
@@ -57,9 +57,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionIntersection.hpp Sun Sep 14 14:03:15 2008
@@ -57,9 +57,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionNodeSet.hpp Sun Sep 14 14:03:15 2008
@@ -66,9 +66,7 @@
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*
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.hpp Sun Sep 14 14:03:15 2008
@@ -58,10 +58,8 @@
virtual bool
endNode(const DOMNodeType* node);
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::startNode;
using ParentType::endNode;
-#endif
private:
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp?rev=695287&r1=695286&r2=695287&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp Sun Sep 14 14:03:15 2008
@@ -314,10 +314,8 @@
virtual bool
endNode(const DOMNodeType* node);
-#if !defined(XALAN_NO_USING_DECLARATION)
using ParentType::startNode;
using ParentType::endNode;
-#endif
private:
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org