[GME-commit] GMESRC/GME/Include/xalanc/XPath ElementPrefixResolverProxy.hpp, 1.1.1.1, 1.2 FormatterStringLengthCounter.hpp, 1.1.1.1, 1.2 Function.hpp, 1.1.1.1, 1.2 FunctionConcat.hpp, 1.1.1.1, 1.2 FunctionContains.hpp, 1.1.1.1, 1.2 FunctionID.hpp, 1.1.1.1, 1.2 FunctionLang.hpp, 1.1.1.1, 1.2 FunctionNamespaceURI.hpp, 1.1.1.1, 1.2 FunctionNormalizeSpace.hpp, 1.1.1.1, 1.2 FunctionStartsWith.hpp, 1.1.1.1, 1.2 FunctionString.hpp, 1.1.1.1, 1.2 FunctionSubstring.hpp, 1.1.1.1, 1.2 FunctionSubstringAfter.hpp, 1.1.1.1, 1.2 FunctionSubstringBefore.hpp, 1.1.1.1, 1.2 FunctionTranslate.hpp, 1.1.1.1, 1.2 MutableNodeRefList.hpp, 1.1.1.1, 1.2 NameSpace.hpp, 1.1.1.1, 1.2 NodeRefList.hpp, 1.1.1.1, 1.2 NodeRefListBase.hpp, 1.1.1.1, 1.2 XBoolean.hpp, 1.1.1.1, 1.2 XNodeSet.hpp, 1.1.1.1, 1.2 XNodeSetAllocator.hpp, 1.1.1.1, 1.2 XNodeSetBase.hpp, 1.1.1.1, 1.2 XNodeSetNodeProxy.hpp, 1.1.1.1, 1.2 XNodeSetNodeProxyAllocator.hpp, 1.1.1.1, 1.2 XNodeSetResultTreeFragProxy.hpp, 1.1.1.1, 1.2 XNull.hpp, 1.1.1.1, 1.2 XNumber.hpp, 1.1.1.1, 1.2 XNumberAllocator.hpp, 1.1.1 .1, 1.2 XNumberBase.hpp, 1.1.1.1, 1.2 XObject.hpp, 1.1.1.1, 1.2 XObjectFactory.hpp, 1.1.1.1, 1.2 XObjectFactoryDefault.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxy.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxyBase.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxyText.hpp, 1.1.1.1, 1.2 XObjectTypeCallback.hpp, 1.1.1.1, 1.2 XPath.hpp, 1.1.1.1, 1.2 XPathAllocator.hpp, 1.1.1.1, 1.2 XPathConstructionContext.hpp, 1.1.1.1, 1.2 XPathConstructionContextDefault.hpp, 1.1.1.1, 1.2 XPathDefinitions.hpp, 1.1.1.1, 1.2 XPathEnvSupport.hpp, 1.1.1.1, 1.2 XPathEnvSupportDefault.hpp, 1.1.1.1, 1.2 XPathEvaluator.hpp, 1.1.1.1, 1.2 XPathExecutionContext.hpp, 1.1.1.1, 1.2 XPathExecutionContextDefault.hpp, 1.1.1.1, 1.2 XPathExpression.hpp, 1.1.1.1, 1.2 XPathFactory.hpp, 1.1.1.1, 1.2 XPathFactoryBlock.hpp, 1.1.1.1, 1.2 XPathFactoryDefault.hpp, 1.1.1.1, 1.2 XPathFunctionTable.hpp, 1.1.1.1, 1.2 XPathInit.hpp, 1.1.1.1, 1.2 XPathParserException.hpp, 1.1.1.1, 1.2 XPathProcessor.hpp, 1.1.1.1, 1.2 XPathProcessorImpl.hpp, 1.1.1.1, 1.2 XSpan.hpp, 1.1.1.1, 1.2 XString.hpp , 1.1.1.1, 1.2 XStringAdapter.hpp, 1.1.1.1, 1.2 XStringAdapterAllocator.hpp, 1.1.1.1, 1.2 XStringAllocator.hpp, 1.1.1.1, 1.2 XStringBase.hpp, 1.1.1.1, 1.2 XStringCached.hpp, 1.1.1.1, 1.2 XStringCachedAllocator.hpp, 1.1.1.1, 1.2 XStringReference.hpp, 1.1.1.1, 1.2 XStringReferenceAllocator.hpp, 1.1.1.1, 1.2 XToken.hpp, 1.1.1.1, 1.2 XTokenNumberAdapter.hpp, 1.1.1.1, 1.2 XTokenNumberAdapterAllocator.hpp, 1.1.1.1, 1.2 XTokenStringAdapter.hpp, 1.1.1.1, 1.2 XTokenStringAdapterAllocator.hpp, 1.1.1.1, 1.2 XUnknown.hpp, 1.1.1.1, 1.2 XalanDocumentFragmentNodeRefListBaseProxy.hpp, 1.1.1.1, 1.2 XalanQName.hpp, 1.1.1.1, 1.2 XalanQNameByReference.hpp, 1.1.1.1, 1.2 XalanQNameByValue.hpp, 1.1.1.1, 1.2 XalanQNameByValueAllocator.hpp, 1.1.1.1, 1.2 XalanXPathException.hpp, 1.1.1.1, 1.2
Log messages of CVS commits
gme-commit at list.isis.vanderbilt.edu
Tue Feb 19 14:14:16 CST 2008
- Previous message: [GME-commit] GMESRC/GME/Include/xalanc/PlatformSupport ArenaBlockBase.hpp, NONE, 1.1 LocalMsgIndex.hpp, NONE, 1.1 XalanDOMStringReusableAllocator.hpp, NONE, 1.1 XalanMemoryManagerDefault.hpp, NONE, 1.1 ArenaAllocator.hpp, 1.1.1.1, 1.2 ArenaBlock.hpp, 1.1.1.1, 1.2 AttributeListImpl.hpp, 1.1.1.1, 1.2 AttributeVectorEntry.hpp, 1.1.1.1, 1.2 AttributeVectorEntryExtended.hpp, 1.1.1.1, 1.2 AttributesImpl.hpp, 1.1.1.1, 1.2 DOMStringHelper.hpp, 1.1.1.1, 1.2 DOMStringPrintWriter.hpp, 1.1.1.1, 1.2 DirectoryEnumerator.hpp, 1.1.1.1, 1.2 DoubleSupport.hpp, 1.1.1.1, 1.2 ExecutionContext.hpp, 1.1.1.1, 1.2 FormatterListener.hpp, 1.1.1.1, 1.2 NamedNodeMapAttributeList.hpp, 1.1.1.1, 1.2 NullPrintWriter.hpp, 1.1.1.1, 1.2 PlatformSupportDefinitions.hpp, 1.1.1.1, 1.2 PlatformSupportInit.hpp, 1.1.1.1, 1.2 PrefixResolver.hpp, 1.1.1.1, 1.2 PrintWriter.hpp, 1.1.1.1, 1.2 Resettable.hpp, 1.1.1.1, 1.2 ReusableArenaAllocator.hpp, 1.1.1.1, 1.2 ReusableArenaBlock.hpp, 1.1.1.1, 1.2 StdBinInputStream.hpp, 1.1.1.1, 1.2 StringTokenizer.hpp, 1.1.1.1, 1.2 URISupport.hpp , 1.1.1.1, 1.2 Writer.hpp, 1.1.1.1, 1.2 XSLException.hpp, 1.1.1.1, 1.2 XalanAllocator.hpp, 1.1.1.1, 1.2 XalanArrayAllocator.hpp, 1.1.1.1, 1.2 XalanBitmap.hpp, 1.1.1.1, 1.2 XalanCollationServices.hpp, 1.1.1.1, 1.2 XalanDOMStringAllocator.hpp, 1.1.1.1, 1.2 XalanDOMStringCache.hpp, 1.1.1.1, 1.2 XalanDOMStringHashTable.hpp, 1.1.1.1, 1.2 XalanDOMStringPool.hpp, 1.1.1.1, 1.2 XalanDecimalFormatSymbols.hpp, 1.1.1.1, 1.2 XalanEncodingPropertyCache.hpp, 1.1.1.1, 1.2 XalanFStreamOutputStream.hpp, 1.1.1.1, 1.2 XalanFileOutputStream.hpp, 1.1.1.1, 1.2 XalanICUMessageLoader.hpp, 1.1.1.1, 1.2 XalanInMemoryMessageLoader.hpp, 1.1.1.1, 1.2 XalanLocator.hpp, 1.1.1.1, 1.2 XalanMessageLoader.hpp, 1.1.1.1, 1.2 XalanNLSMessageLoader.hpp, 1.1.1.1, 1.2 XalanNamespace.hpp, 1.1.1.1, 1.2 XalanNullOutputStream.hpp, 1.1.1.1, 1.2 XalanNumberFormat.hpp, 1.1.1.1, 1.2 XalanOutputStream.hpp, 1.1.1.1, 1.2 XalanOutputStreamPrintWriter.hpp, 1.1.1.1, 1.2 XalanParsedURI.hpp, 1.1.1.1, 1.2 XalanReferenceCountedObject.hpp, 1.1.1.1, 1.2 XalanSimplePrefixResolver.hpp, 1.1.1 .1, 1.2 XalanStdOutputStream.hpp, 1.1.1.1, 1.2 XalanToXercesTranscoderWrapper.hpp, 1.1.1.1, 1.2 XalanTranscodingServices.hpp, 1.1.1.1, 1.2 XalanUTF16Transcoder.hpp, 1.1.1.1, 1.2 XalanUnicode.hpp, 1.1.1.1, 1.2 XalanXMLChar.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xalanc/XSLT XalanMatchPatternData.hpp, NONE, 1.1 XalanMatchPatternDataAllocator.hpp, NONE, 1.1 XalanSpaceNodeTester.hpp, NONE, 1.1 AVT.hpp, 1.1.1.1, 1.2 AVTPart.hpp, 1.1.1.1, 1.2 AVTPartSimple.hpp, 1.1.1.1, 1.2 AVTPartXPath.hpp, 1.1.1.1, 1.2 Constants.hpp, 1.1.1.1, 1.2 CountersTable.hpp, 1.1.1.1, 1.2 DecimalToRoman.hpp, 1.1.1.1, 1.2 ElemApplyImport.hpp, 1.1.1.1, 1.2 ElemApplyTemplates.hpp, 1.1.1.1, 1.2 ElemAttribute.hpp, 1.1.1.1, 1.2 ElemAttributeSet.hpp, 1.1.1.1, 1.2 ElemCallTemplate.hpp, 1.1.1.1, 1.2 ElemChoose.hpp, 1.1.1.1, 1.2 ElemComment.hpp, 1.1.1.1, 1.2 ElemCopy.hpp, 1.1.1.1, 1.2 ElemCopyOf.hpp, 1.1.1.1, 1.2 ElemDecimalFormat.hpp, 1.1.1.1, 1.2 ElemElement.hpp, 1.1.1.1, 1.2 ElemEmpty.hpp, 1.1.1.1, 1.2 ElemExtensionCall.hpp, 1.1.1.1, 1.2 ElemFallback.hpp, 1.1.1.1, 1.2 ElemForEach.hpp, 1.1.1.1, 1.2 ElemForwardCompatible.hpp, 1.1.1.1, 1.2 ElemIf.hpp, 1.1.1.1, 1.2 ElemLiteralResult.hpp, 1.1.1.1, 1.2 ElemMessage.hpp, 1.1.1.1, 1.2 ElemNumber.hpp, 1.1.1.1, 1.2 ElemOtherwise.hpp, 1.1.1.1, 1.2 ElemPI.hpp, 1.1.1.1 , 1.2 ElemParam.hpp, 1.1.1.1, 1.2 ElemSort.hpp, 1.1.1.1, 1.2 ElemTemplate.hpp, 1.1.1.1, 1.2 ElemTemplateElement.hpp, 1.1.1.1, 1.2 ElemText.hpp, 1.1.1.1, 1.2 ElemTextLiteral.hpp, 1.1.1.1, 1.2 ElemUse.hpp, 1.1.1.1, 1.2 ElemValueOf.hpp, 1.1.1.1, 1.2 ElemVariable.hpp, 1.1.1.1, 1.2 ElemWhen.hpp, 1.1.1.1, 1.2 ElemWithParam.hpp, 1.1.1.1, 1.2 ExtensionFunctionHandler.hpp, 1.1.1.1, 1.2 ExtensionNSHandler.hpp, 1.1.1.1, 1.2 FunctionCurrent.hpp, 1.1.1.1, 1.2 FunctionDocument.hpp, 1.1.1.1, 1.2 FunctionElementAvailable.hpp, 1.1.1.1, 1.2 FunctionFormatNumber.hpp, 1.1.1.1, 1.2 FunctionFunctionAvailable.hpp, 1.1.1.1, 1.2 FunctionGenerateID.hpp, 1.1.1.1, 1.2 FunctionKey.hpp, 1.1.1.1, 1.2 FunctionSystemProperty.hpp, 1.1.1.1, 1.2 FunctionUnparsedEntityURI.hpp, 1.1.1.1, 1.2 GenerateEvent.hpp, 1.1.1.1, 1.2 KeyDeclaration.hpp, 1.1.1.1, 1.2 KeyTable.hpp, 1.1.1.1, 1.2 NamespacesHandler.hpp, 1.1.1.1, 1.2 NodeSortKey.hpp, 1.1.1.1, 1.2 NodeSorter.hpp, 1.1.1.1, 1.2 OutputContextStack.hpp, 1.1.1.1, 1.2 ProblemListener.hpp, 1.1.1.1, 1.2 ProblemListenerDefault.hpp, 1 .1.1.1, 1.2 ResultNamespacesStack.hpp, 1.1.1.1, 1.2 SelectionEvent.hpp, 1.1.1.1, 1.2 Stylesheet.hpp, 1.1.1.1, 1.2 StylesheetConstructionContext.hpp, 1.1.1.1, 1.2 StylesheetConstructionContextDefault.hpp, 1.1.1.1, 1.2 StylesheetExecutionContext.hpp, 1.1.1.1, 1.2 StylesheetExecutionContextDefault.hpp, 1.1.1.1, 1.2 StylesheetHandler.hpp, 1.1.1.1, 1.2 StylesheetRoot.hpp, 1.1.1.1, 1.2 TopLevelArg.hpp, 1.1.1.1, 1.2 TraceListener.hpp, 1.1.1.1, 1.2 TraceListenerDefault.hpp, 1.1.1.1, 1.2 TracerEvent.hpp, 1.1.1.1, 1.2 VariablesStack.hpp, 1.1.1.1, 1.2 XResultTreeFrag.hpp, 1.1.1.1, 1.2 XResultTreeFragAllocator.hpp, 1.1.1.1, 1.2 XSLTDefinitions.hpp, 1.1.1.1, 1.2 XSLTEngineImpl.hpp, 1.1.1.1, 1.2 XSLTInit.hpp, 1.1.1.1, 1.2 XSLTInputSource.hpp, 1.1.1.1, 1.2 XSLTProcessor.hpp, 1.1.1.1, 1.2 XSLTProcessorEnvSupport.hpp, 1.1.1.1, 1.2 XSLTProcessorEnvSupportDefault.hpp, 1.1.1.1, 1.2 XSLTProcessorException.hpp, 1.1.1.1, 1.2 XSLTResultTarget.hpp, 1.1.1.1, 1.2 XalanAVTAllocator.hpp, 1.1.1.1, 1.2 XalanAVTPartSimpleAllocator.hpp, 1.1.1.1, 1.2 XalanAVTPar tXPathAllocator.hpp, 1.1.1.1, 1.2 XalanElemApplyTemplatesAllocator.hpp, 1.1.1.1, 1.2 XalanElemAttributeAllocator.hpp, 1.1.1.1, 1.2 XalanElemAttributeSetAllocator.hpp, 1.1.1.1, 1.2 XalanElemCallTemplateAllocator.hpp, 1.1.1.1, 1.2 XalanElemElementAllocator.hpp, 1.1.1.1, 1.2 XalanElemEmptyAllocator.hpp, 1.1.1.1, 1.2 XalanElemLiteralResultAllocator.hpp, 1.1.1.1, 1.2 XalanElemTemplateAllocator.hpp, 1.1.1.1, 1.2 XalanElemTextAllocator.hpp, 1.1.1.1, 1.2 XalanElemTextLiteralAllocator.hpp, 1.1.1.1, 1.2 XalanElemValueOfAllocator.hpp, 1.1.1.1, 1.2 XalanElemVariableAllocator.hpp, 1.1.1.1, 1.2 XalanNumberingResourceBundle.hpp, 1.1.1.1, 1.2 XalanSourceTreeDocumentAllocator.hpp, 1.1.1.1, 1.2 XalanSourceTreeDocumentFragmentAllocator.hpp, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /project/gme-repository/GMESRC/GME/Include/xalanc/XPath
In directory escher:/tmp/cvs-serv25974/XPath
Modified Files:
ElementPrefixResolverProxy.hpp
FormatterStringLengthCounter.hpp Function.hpp
FunctionConcat.hpp FunctionContains.hpp FunctionID.hpp
FunctionLang.hpp FunctionNamespaceURI.hpp
FunctionNormalizeSpace.hpp FunctionStartsWith.hpp
FunctionString.hpp FunctionSubstring.hpp
FunctionSubstringAfter.hpp FunctionSubstringBefore.hpp
FunctionTranslate.hpp MutableNodeRefList.hpp NameSpace.hpp
NodeRefList.hpp NodeRefListBase.hpp XBoolean.hpp XNodeSet.hpp
XNodeSetAllocator.hpp XNodeSetBase.hpp XNodeSetNodeProxy.hpp
XNodeSetNodeProxyAllocator.hpp XNodeSetResultTreeFragProxy.hpp
XNull.hpp XNumber.hpp XNumberAllocator.hpp XNumberBase.hpp
XObject.hpp XObjectFactory.hpp XObjectFactoryDefault.hpp
XObjectResultTreeFragProxy.hpp
XObjectResultTreeFragProxyBase.hpp
XObjectResultTreeFragProxyText.hpp XObjectTypeCallback.hpp
XPath.hpp XPathAllocator.hpp XPathConstructionContext.hpp
XPathConstructionContextDefault.hpp XPathDefinitions.hpp
XPathEnvSupport.hpp XPathEnvSupportDefault.hpp
XPathEvaluator.hpp XPathExecutionContext.hpp
XPathExecutionContextDefault.hpp XPathExpression.hpp
XPathFactory.hpp XPathFactoryBlock.hpp XPathFactoryDefault.hpp
XPathFunctionTable.hpp XPathInit.hpp XPathParserException.hpp
XPathProcessor.hpp XPathProcessorImpl.hpp XSpan.hpp
XString.hpp XStringAdapter.hpp XStringAdapterAllocator.hpp
XStringAllocator.hpp XStringBase.hpp XStringCached.hpp
XStringCachedAllocator.hpp XStringReference.hpp
XStringReferenceAllocator.hpp XToken.hpp
XTokenNumberAdapter.hpp XTokenNumberAdapterAllocator.hpp
XTokenStringAdapter.hpp XTokenStringAdapterAllocator.hpp
XUnknown.hpp XalanDocumentFragmentNodeRefListBaseProxy.hpp
XalanQName.hpp XalanQNameByReference.hpp XalanQNameByValue.hpp
XalanQNameByValueAllocator.hpp XalanXPathException.hpp
Log Message:
Xalan1.10 include files.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: XStringBase.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringBase.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringBase.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XStringBase.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSTRINGBASE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSTRINGBASE_HEADER_GUARD_1357924680)
***************
*** 89,95 ****
*
*/
! XStringBase();
! XStringBase(const XStringBase& source);
virtual
--- 48,61 ----
*
*/
! XStringBase(MemoryManagerType& theManager);
! XStringBase(const XStringBase& source,
! MemoryManagerType& theManager);
!
! MemoryManagerType&
! getMemoryManager()const
! {
! return m_resultTreeFrag.getMemoryManager();
! }
virtual
***************
*** 99,110 ****
// These methods are inherited from XObject ...
! #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
! virtual XObject*
! #else
! virtual XStringBase*
! #endif
! clone(void* theAddress = 0) const = 0;
!
! virtual XalanDOMString
getTypeString() const;
--- 65,69 ----
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
***************
*** 140,143 ****
--- 99,105 ----
private:
+ // Not implemented
+ XStringBase(const XStringBase& source);
+ XStringBase();
mutable double m_cachedNumberValue;
Index: XTokenStringAdapterAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XTokenStringAdapterAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XTokenStringAdapterAllocator.hpp 8 Apr 2004 07:57:14 -0000 1.1.1.1
--- XTokenStringAdapterAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XTokenStringAdapterAllocator(size_type theBlockCount);
~XTokenStringAdapterAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XTokenStringAdapterAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XTokenStringAdapterAllocator();
***************
*** 106,118 ****
create(const XToken& theXToken);
- /**
- * Clone an XTokenStringAdapter object.
- *
- * @param value source XTokenStringAdapter
- *
- * @return pointer to an XTokenStringAdapter
- */
- object_type*
- clone(const object_type& value);
/**
--- 65,68 ----
Index: XalanXPathException.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XalanXPathException.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanXPathException.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XalanXPathException.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALANXPATHEXCEPTION_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALANXPATHEXCEPTION_HEADER_GUARD_1357924680)
***************
*** 102,107 ****
int theLineNumber,
int theColumnNumber,
! const XalanNode* styleNode = 0,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
/**
--- 61,65 ----
int theLineNumber,
int theColumnNumber,
! MemoryManagerType& theManager);
/**
***************
*** 116,121 ****
const LocatorType& theLocator,
const XalanDOMString& theMessage,
! const XalanNode* styleNode = 0,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
/**
--- 74,78 ----
const LocatorType& theLocator,
const XalanDOMString& theMessage,
! MemoryManagerType& theManager);
/**
***************
*** 123,141 ****
*
* @param message message explaining the problem.
- * @param styleNode the node in the stylesheet where the problem occurred
* @param theType type of exception, default is "XalanXPathException"
*/
! XalanXPathException(
! const XalanDOMString& message,
! const XalanNode* styleNode = 0,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
virtual
~XalanXPathException();
! const XalanNode*
! getStyleNode() const
{
! return m_styleNode;
}
--- 80,97 ----
*
* @param message message explaining the problem.
* @param theType type of exception, default is "XalanXPathException"
*/
! XalanXPathException(const XalanDOMString& message,
! MemoryManagerType& theManager);
!
! XalanXPathException(const XalanXPathException& other);
virtual
~XalanXPathException();
! virtual const XalanDOMChar*
! getType() const
{
! return m_type;
}
***************
*** 147,153 ****
*/
explicit
! XalanXPathException();
private:
const XalanNode* m_styleNode;
--- 103,110 ----
*/
explicit
! XalanXPathException(MemoryManagerType& theManager);
private:
+ static const XalanDOMChar m_type[];
const XalanNode* m_styleNode;
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathEnvSupportDefault.hpp 8 Apr 2004 07:57:09 -0000 1.1.1.1
--- XPathEnvSupportDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XPATHENVSUPPORTDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHENVSUPPORTDEFAULT_HEADER_GUARD_1357924680)
***************
*** 64,80 ****
// Base include file. Must be first.
#include <xalanc/XPath/XPathDefinitions.hpp>
!
! #include <vector>
!
! #include <xalanc/XPath/XPathEnvSupport.hpp>
!
XALAN_CPP_NAMESPACE_BEGIN
--- 21,37 ----
// Base include file. Must be first.
#include <xalanc/XPath/XPathDefinitions.hpp>
+ #include <xalanc/XPath/XPathEnvSupport.hpp>
! #include<xalanc/PlatformSupport/DOMStringHelper.hpp>
! #include<xalanc/Include/XalanMap.hpp>
XALAN_CPP_NAMESPACE_BEGIN
+ typedef XalanMap<XalanDOMString, const Function*> FunctionTableTypeDefinition;
+ XALAN_USES_MEMORY_MANAGER(FunctionTableTypeDefinition)
***************
*** 82,85 ****
--- 39,43 ----
* Dummy class in order to make the XPath object happy
* for diagnostic purposes.
+ * @author <a href="mailto:david_n_bertoni at us.ibm.com">David N. Bertoni</a>
*/
class XALAN_XPATH_EXPORT XPathEnvSupportDefault : public XPathEnvSupport
***************
*** 87,99 ****
public:
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef map<XalanDOMString, XalanDocument*, less<XalanDOMString> > SourceDocsTableType;
! typedef map<XalanDOMString, const Function*, less<XalanDOMString> > FunctionTableType;
! typedef map<XalanDOMString, FunctionTableType, less<XalanDOMString> > NamespaceFunctionTablesType;
! #else
! typedef std::map<XalanDOMString, XalanDocument*> SourceDocsTableType;
! typedef std::map<XalanDOMString, const Function*> FunctionTableType;
! typedef std::map<XalanDOMString, FunctionTableType> NamespaceFunctionTablesType;
! #endif
/**
--- 45,51 ----
public:
! typedef XalanMap<XalanDOMString, XalanDocument*> SourceDocsTableType;
! typedef FunctionTableTypeDefinition FunctionTableType;
! typedef XalanMap<XalanDOMString, FunctionTableType> NamespaceFunctionTablesType;
/**
***************
*** 102,106 ****
*/
static void
! initialize();
/**
--- 54,58 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
***************
*** 111,119 ****
! XPathEnvSupportDefault();
virtual
~XPathEnvSupportDefault();
// Interfaces to install and uninstall external functions globally.
--- 63,76 ----
! XPathEnvSupportDefault(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XPathEnvSupportDefault();
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_sourceDocs.getMemoryManager();
+ }
// Interfaces to install and uninstall external functions globally.
***************
*** 176,179 ****
--- 133,137 ----
virtual XalanDocument*
parseXML(
+ MemoryManagerType& theManager,
const XalanDOMString& urlString,
const XalanDOMString& base);
***************
*** 187,192 ****
XalanDocument* theDocument);
! virtual XalanDOMString
! findURIFromDoc(const XalanDocument* owner) const;
virtual bool
--- 145,150 ----
XalanDocument* theDocument);
! virtual const XalanDOMString&
! findURIFromDoc(const XalanDocument* owner) const;
virtual bool
***************
*** 231,234 ****
--- 189,193 ----
typedef NamespaceFunctionTablesType NamespaceFunctionTablesInnerType;
+ NamespaceFunctionTableDeleteFunctor(MemoryManagerType& theManager);
/**
* Delete the value object in a map value pair. The value of the pair must
***************
*** 239,242 ****
--- 198,203 ----
void
operator()(const NamespaceFunctionTablesInnerType::value_type& thePair) const;
+ private:
+ MemoryManagerType& m_memMgr;
};
***************
*** 306,313 ****
NamespaceFunctionTablesType m_externalFunctions;
! static NamespaceFunctionTablesType s_externalFunctions;
! };
!
XALAN_CPP_NAMESPACE_END
--- 267,274 ----
NamespaceFunctionTablesType m_externalFunctions;
! static NamespaceFunctionTablesType s_externalFunctions;
+ static const XalanDOMString s_emptyString;
+ };
XALAN_CPP_NAMESPACE_END
Index: XObjectFactoryDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObjectFactoryDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObjectFactoryDefault.hpp 8 Apr 2004 07:57:05 -0000 1.1.1.1
--- XObjectFactoryDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECTFACTORYDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECTFACTORYDEFAULT_HEADER_GUARD_1357924680)
***************
*** 65,70 ****
! #include <set>
! #include <vector>
--- 24,28 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 75,80 ****
--- 33,40 ----
+ #include <xalanc/XPath/XBoolean.hpp>
#include <xalanc/XPath/XNodeSetAllocator.hpp>
#include <xalanc/XPath/XNodeSetNodeProxyAllocator.hpp>
+ #include <xalanc/XPath/XNull.hpp>
#include <xalanc/XPath/XNumberAllocator.hpp>
#include <xalanc/XPath/XStringAllocator.hpp>
***************
*** 87,100 ****
- #if defined(XALAN_AUTO_PTR_REQUIRES_DEFINITION)
- #include <xalanc/XPath/XNull.hpp>
- #include <xalanc/XPath/XBoolean.hpp>
- #endif
-
-
-
- #include <xalanc/Include/XalanAutoPtr.hpp>
-
-
XALAN_CPP_NAMESPACE_BEGIN
--- 47,50 ----
***************
*** 102,111 ****
- class XBoolean;
- class XNull;
- class XNumber;
-
-
-
/**
* This class handles the creation of XObjects and manages their lifetime.
--- 52,55 ----
***************
*** 128,132 ****
};
! typedef unsigned long size_type;
/**
--- 72,76 ----
};
! typedef XNodeSetAllocator::size_type size_type;
/**
***************
*** 139,142 ****
--- 83,87 ----
explicit
XObjectFactoryDefault(
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
size_type theXStringBlockSize = eDefaultXStringBlockSize,
size_type theXNumberBlockSize = eDefaultXNumberBlockSize,
***************
*** 144,150 ****
--- 89,109 ----
size_type theXNodeSetNodeProxyBlockSize = eDefaultXNodeSetNodeProxyBlockSize);
+ static XObjectFactoryDefault*
+ create(
+ MemoryManagerType& theManager,
+ size_type theXStringBlockSize = eDefaultXStringBlockSize,
+ size_type theXNumberBlockSize = eDefaultXNumberBlockSize,
+ size_type theXNodeSetBlockSize = eDefaultXNodeSetBlockSize,
+ size_type theXNodeSetNodeProxyBlockSize = eDefaultXNodeSetNodeProxyBlockSize);
+
+
virtual
~XObjectFactoryDefault();
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_xobjects.getMemoryManager();
+ }
// These methods are inherited from XObjectFactory ...
***************
*** 197,211 ****
const XalanDOMString& theValue);
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<XObject*> XObjectCollectionType;
! typedef vector<XNumber*> XNumberCacheType;
! typedef vector<XNodeSet*> XNodeSetCacheType;
! typedef vector<XString*> XStringCacheType;
! #else
! typedef std::vector<XObject*> XObjectCollectionType;
! typedef std::vector<XNumber*> XNumberCacheType;
! typedef std::vector<XNodeSet*> XNodeSetCacheType;
! typedef std::vector<XString*> XStringCacheType;
! #endif
protected:
--- 156,163 ----
const XalanDOMString& theValue);
! typedef XalanVector<XObject*> XObjectCollectionType;
! typedef XalanVector<XNumber*> XNumberCacheType;
! typedef XalanVector<XNodeSet*> XNodeSetCacheType;
! typedef XalanVector<XString*> XStringCacheType;
protected:
***************
*** 258,266 ****
XStringCacheType m_xstringCache;
! const XalanAutoPtr<XNull> m_XNull;
! const XalanAutoPtr<XBoolean> m_xbooleanFalse;
! const XalanAutoPtr<XBoolean> m_xbooleanTrue;
};
--- 210,218 ----
XStringCacheType m_xstringCache;
! XNull m_xnull;
! XBoolean m_xbooleanFalse;
! XBoolean m_xbooleanTrue;
};
Index: XObject.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObject.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObject.hpp 8 Apr 2004 07:57:05 -0000 1.1.1.1
--- XObject.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECT_HEADER_GUARD_1357924680)
***************
*** 132,136 ****
*/
static void
! initialize();
/**
--- 91,95 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
***************
*** 149,169 ****
XObject(const XObject& source);
- /**
- * Clone the instance
- *
- * @param If theAddress is not null, the XObject will clone itself into that address.
- * @return a clone of the instance.
- */
- virtual XObject*
- clone(void* theAddress = 0) const = 0;
! /**
! * Given a request type, return the equivalent string.
! * For diagnostic purposes.
! *
! * @return string for type
! */
! virtual XalanDOMString
! getTypeString() const = 0;
/**
--- 108,120 ----
XObject(const XObject& source);
! /**
! * Given a request type, return the equivalent string.
! * For diagnostic purposes.
! *
! * @return string for type
! */
! virtual const XalanDOMString&
! getTypeString() const = 0;
/**
***************
*** 202,206 ****
virtual void
str(
! FormatterListener& formatterListener,
MemberFunctionPtr function) const = 0;
--- 153,157 ----
virtual void
str(
! FormatterListener& formatterListener,
MemberFunctionPtr function) const = 0;
***************
*** 482,488 ****
static double
! number(const XalanDOMString& theString)
{
! return DoubleSupport::toDouble(theString);
}
--- 433,440 ----
static double
! number(const XalanDOMString& theString,
! MemoryManagerType& theManager)
{
! return DoubleSupport::toDouble(theString, theManager);
}
***************
*** 524,533 ****
explicit
XObjectException(
! const XalanDOMString& message = XalanDOMString(),
! const XalanNode* styleNode = 0,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XObjectException")));
virtual
~XObjectException();
};
--- 476,495 ----
explicit
XObjectException(
! const XalanDOMString& message = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
! MemoryManagerType& theManager = XalanMemMgrs::getDummyMemMgr());
!
! XObjectException( const XObjectException& other) ;
virtual
~XObjectException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+ private:
+
+ static const XalanDOMChar m_type[];
};
***************
*** 537,568 ****
XObjectInvalidConversionException(
! const XalanDOMString& fromType,
! const XalanDOMString& toType);
virtual
~XObjectInvalidConversionException();
! const XalanDOMString&
! getFromType() const
{
! return m_fromType;
}
- const XalanDOMString&
- getToType() const
- {
- return m_toType;
- }
private:
! static const XalanDOMString
formatErrorString(
const XalanDOMString& fromType,
! const XalanDOMString& toType);
- const XalanDOMString m_fromType;
! const XalanDOMString m_toType;
};
--- 499,532 ----
XObjectInvalidConversionException(
! eObjectType fromType,
! eObjectType toType);
!
!
! XObjectInvalidConversionException( const XObjectInvalidConversionException& other);
virtual
~XObjectInvalidConversionException();
! virtual const XalanDOMChar*
! getType() const
{
! return m_type;
}
private:
! static const XalanDOMChar m_type[];
!
! static const XalanDOMString&
formatErrorString(
const XalanDOMString& fromType,
! const XalanDOMString& toType,
! XalanDOMString& theResult);
! const eObjectType m_from;
!
! const eObjectType m_to;
};
***************
*** 586,596 ****
~XObject();
! static const XalanDOMString s_nullString;
! protected:
! static XalanDOMString s_falseString;
! static XalanDOMString s_trueString;
private:
--- 550,568 ----
~XObject();
! static const XalanDOMString s_emptyString;
! static const XalanDOMString& s_booleanString;
! static const XalanDOMString& s_falseString;
! static const XalanDOMString& s_nodesetString;
!
! static const XalanDOMString& s_numberString;
!
! static const XalanDOMString& s_resultTreeFragmentString;
!
! static const XalanDOMString& s_stringString;
!
! static const XalanDOMString& s_trueString;
private:
Index: XPathFactoryDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathFactoryDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathFactoryDefault.hpp 8 Apr 2004 07:57:10 -0000 1.1.1.1
--- XPathFactoryDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHFACTORYDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHFACTORYDEFAULT_HEADER_GUARD_1357924680)
***************
*** 65,69 ****
! #include <set>
--- 24,28 ----
! #include <xalanc/Include/XalanSet.hpp>
***************
*** 84,92 ****
explicit
! XPathFactoryDefault();
virtual
~XPathFactoryDefault();
// Inherited from XPathFactory...
--- 43,53 ----
explicit
! XPathFactoryDefault(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
~XPathFactoryDefault();
+ static XPathFactoryDefault*
+ createXPathFactoryDefault(MemoryManagerType& theManager);
// Inherited from XPathFactory...
***************
*** 96,108 ****
// Inherited from XPathFactory...
virtual XPath*
create();
!
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef set<const XPath*, less<const XPath*> > CollectionType;
! #else
! typedef std::set<const XPath*> CollectionType;
! #endif
CollectionType::size_type
--- 57,65 ----
// Inherited from XPathFactory...
+
virtual XPath*
create();
! typedef XalanSet<const XPath*> CollectionType;
CollectionType::size_type
Index: XPath.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPath.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPath.hpp 8 Apr 2004 07:57:08 -0000 1.1.1.1
--- XPath.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...2985 lines suppressed...]
! OpCodeMapPositionType opPos) const;
void
***************
*** 2526,2532 ****
*
*/
! static FunctionTableType s_functions;
! static const XalanDOMString s_emptyString;
};
--- 2628,2634 ----
*
*/
! static FunctionTableType s_functions;
! static const XalanDOMString s_emptyString;
};
Index: XNodeSetBase.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNodeSetBase.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNodeSetBase.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNodeSetBase.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNODESETBASE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNODESETBASE_HEADER_GUARD_1357924680)
***************
*** 70,73 ****
--- 29,33 ----
+ #include <xalanc/XPath/NodeRefListBase.hpp>
#include <xalanc/XPath/XNodeSetResultTreeFragProxy.hpp>
***************
*** 85,103 ****
public:
! typedef size_t size_type;
virtual
~XNodeSetBase();
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XNodeSetBase*
- #endif
- clone(void* theAddress = 0) const = 0;
! virtual XalanDOMString
getTypeString() const;
--- 45,63 ----
public:
! typedef NodeRefListBase::size_type size_type;
virtual
~XNodeSetBase();
+ MemoryManagerType&
+ getMemoryManager()const
+ {
+ return m_cachedStringValue.getMemoryManager();
+ }
+
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
***************
*** 145,149 ****
* Create an XNodeSetBase
*/
! XNodeSetBase();
/**
--- 105,109 ----
* Create an XNodeSetBase
*/
! XNodeSetBase(MemoryManagerType& theManager);
/**
***************
*** 152,156 ****
* @param source object to copy
*/
! XNodeSetBase(const XNodeSetBase& source);
void
--- 112,116 ----
* @param source object to copy
*/
! XNodeSetBase(const XNodeSetBase& source, MemoryManagerType& theManager);
void
***************
*** 160,163 ****
--- 120,125 ----
// Not implemented...
+ XNodeSetBase();
+ XNodeSetBase(const XNodeSetBase&);
XNodeSetBase&
operator=(const XNodeSetBase&);
Index: FunctionSubstring.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionSubstring.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionSubstring.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionSubstring.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONSUBSTRING_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONSUBSTRING_HEADER_GUARD_1357924680)
***************
*** 124,133 ****
virtual FunctionSubstring*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 83,92 ----
virtual FunctionSubstring*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XPathExpression.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathExpression.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathExpression.hpp 8 Apr 2004 07:57:10 -0000 1.1.1.1
--- XPathExpression.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...2880 lines suppressed...]
! // Default vector allocation sizes.
! enum
! {
! eDefaultOpMapSize = 100,
! eDefaultTokenQueueSize = 30
! };
! NumberLiteralValueVectorType m_numberLiteralValues;
};
***************
*** 1458,1460 ****
! #endif // XPATHEXPRESSION_HEADER_GUARD_1357924680
--- 1506,1508 ----
! #endif // XPATHEXPRESSION_HEADER_GUARD_1357924680
Index: XNodeSetResultTreeFragProxy.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNodeSetResultTreeFragProxy.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNodeSetResultTreeFragProxy.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNodeSetResultTreeFragProxy.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNODESETRESULTTREEFRAGPROXY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNODESETRESULTTREEFRAGPROXY_HEADER_GUARD_1357924680)
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathExecutionContext.hpp 8 Apr 2004 07:57:09 -0000 1.1.1.1
--- XPathExecutionContext.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...1370 lines suppressed...]
! virtual void
! message(
! const XalanDOMString& msg,
! const XalanNode* sourceNode = 0,
! const LocatorType* locator = 0) const = 0;
protected:
! XObjectFactory* m_xobjectFactory;
};
***************
*** 755,757 ****
! #endif // XPATHEXECUTIONCONTEXT_HEADER_GUARD_1357924680
--- 724,726 ----
! #endif // XPATHEXECUTIONCONTEXT_HEADER_GUARD_1357924680
Index: XalanQNameByValue.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XalanQNameByValue.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanQNameByValue.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XalanQNameByValue.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALANQNAMEBYVALUE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALANQNAMEBYVALUE_HEADER_GUARD_1357924680)
***************
*** 92,96 ****
*/
explicit
! XalanQNameByValue();
/**
--- 51,61 ----
*/
explicit
! XalanQNameByValue(MemoryManagerType& theManager);
!
! MemoryManagerType&
! getMemoryManager()
! {
! return m_namespace.getMemoryManager();
! }
/**
***************
*** 99,103 ****
* @param theSource The source of the copy.
*/
! XalanQNameByValue(const XalanQNameByValue& theSource);
/**
--- 64,69 ----
* @param theSource The source of the copy.
*/
! XalanQNameByValue(const XalanQNameByValue& theSource,
! MemoryManagerType& theManager);
/**
***************
*** 107,111 ****
*/
explicit
! XalanQNameByValue(const XalanQName& theSource);
/**
--- 73,78 ----
*/
explicit
! XalanQNameByValue(const XalanQName& theSource,
! MemoryManagerType& theManager);
/**
***************
*** 117,121 ****
XalanQNameByValue(
const XalanDOMString& theNamespace,
! const XalanDOMString& theLocalPart);
/**
--- 84,95 ----
XalanQNameByValue(
const XalanDOMString& theNamespace,
! const XalanDOMString& theLocalPart,
! MemoryManagerType& theManager);
!
! static XalanQNameByValue*
! create(
! const XalanDOMString& theNamespace,
! const XalanDOMString& theLocalPart,
! MemoryManagerType& theManager);
/**
***************
*** 131,134 ****
--- 105,109 ----
const XalanDOMString& qname,
const NamespacesStackType& namespaces,
+ MemoryManagerType& theManager,
const LocatorType* locator = 0,
bool fUseDefault = false);
***************
*** 146,149 ****
--- 121,125 ----
const XalanDOMChar* qname,
const NamespacesStackType& namespaces,
+ MemoryManagerType& theManager,
const LocatorType* locator = 0,
bool fUseDefault = false);
***************
*** 164,167 ****
--- 140,144 ----
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport,
+ MemoryManagerType& theManager,
const LocatorType* locator = 0);
***************
*** 176,179 ****
--- 153,157 ----
XalanQNameByValue(
const XalanDOMString& qname,
+ MemoryManagerType& theManager,
const PrefixResolver* theResolver = 0,
const LocatorType* locator = 0);
***************
*** 312,316 ****
private:
!
void
initialize(
--- 290,295 ----
private:
! // not implemented
! XalanQNameByValue(const XalanQNameByValue& theSource);
void
initialize(
Index: XStringReferenceAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringReferenceAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringReferenceAllocator.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XStringReferenceAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XStringReferenceAllocator(size_type theBlockCount);
~XStringReferenceAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XStringReferenceAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XStringReferenceAllocator();
***************
*** 106,118 ****
createString(const XalanDOMString& theString);
- /**
- * Clone an XStringReference object.
- *
- * @param value source XStringReference
- *
- * @return pointer to an XStringReference
- */
- string_type*
- clone(const string_type& value);
/**
--- 65,68 ----
Index: XNumberBase.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNumberBase.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNumberBase.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNumberBase.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNUMBERBASE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNUMBERBASE_HEADER_GUARD_1357924680)
***************
*** 91,95 ****
// These methods are inherited from XObject ...
! virtual XalanDOMString
getTypeString() const;
--- 50,54 ----
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
Index: XBoolean.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XBoolean.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XBoolean.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XBoolean.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XBOOLEAN_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XBOOLEAN_HEADER_GUARD_1357924680)
***************
*** 94,105 ****
// These methods are inherited from XObject ...
! #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
! virtual XObject*
! #else
! virtual XBoolean*
! #endif
! clone(void* theAddress = 0) const;
!
! virtual XalanDOMString
getTypeString() const;
--- 53,57 ----
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
Index: XStringReference.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringReference.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringReference.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XStringReference.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSTRINGREFERENCE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSTRINGREFERENCE_HEADER_GUARD_1357924680)
***************
*** 88,94 ****
* @param value source string
*/
! XStringReference(const XalanDOMString& val);
! XStringReference(const XStringReference& source);
virtual
--- 47,55 ----
* @param value source string
*/
! XStringReference(const XalanDOMString& val,
! MemoryManagerType& theManager);
! XStringReference(const XStringReference& source,
! MemoryManagerType& theManager);
virtual
***************
*** 98,108 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XStringReference*
- #endif
- clone(void* theAddress = 0) const;
-
virtual const XalanDOMString&
str() const;
--- 59,62 ----
***************
*** 126,129 ****
--- 80,86 ----
private:
+ // Not implemented
+ XStringReference(const XStringReference& source);
+ XStringReference();
const XalanDOMString& m_value;
Index: XalanDocumentFragmentNodeRefListBaseProxy.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanDocumentFragmentNodeRefListBaseProxy.hpp 8 Apr 2004 07:57:02 -0000 1.1.1.1
--- XalanDocumentFragmentNodeRefListBaseProxy.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALANDOCUMENTFRAGMENTNODEREFLISTBASEPROXY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALANDOCUMENTFRAGMENTNODEREFLISTBASEPROXY_HEADER_GUARD_1357924680)
Index: FunctionString.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionString.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionString.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionString.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONSTRING_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONSTRING_HEADER_GUARD_1357924680)
***************
*** 120,129 ****
virtual FunctionString*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 79,88 ----
virtual FunctionString*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XStringAdapter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringAdapter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringAdapter.hpp 8 Apr 2004 07:57:12 -0000 1.1.1.1
--- XStringAdapter.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSTRINGADAPTER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSTRINGADAPTER_HEADER_GUARD_1357924680)
***************
*** 87,93 ****
* @param theValue value used to create object
*/
! XStringAdapter(const XObjectPtr& val);
! XStringAdapter(const XStringAdapter& source);
virtual
--- 46,54 ----
* @param theValue value used to create object
*/
! XStringAdapter(const XObjectPtr& val,
! MemoryManagerType& theManager);
! XStringAdapter(const XStringAdapter& source,
! MemoryManagerType& theManager);
virtual
***************
*** 97,107 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XStringAdapter*
- #endif
- clone(void* theAddress = 0) const;
-
virtual const XalanDOMString&
str() const;
--- 58,61 ----
***************
*** 125,128 ****
--- 79,85 ----
private:
+ // Not implemented
+ XStringAdapter(const XStringAdapter& source);
+ XStringAdapter();
const XObjectPtr m_value;
Index: XObjectResultTreeFragProxy.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObjectResultTreeFragProxy.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObjectResultTreeFragProxy.hpp 8 Apr 2004 07:57:05 -0000 1.1.1.1
--- XObjectResultTreeFragProxy.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECTRESULTTREEFRAGPROXY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECTRESULTTREEFRAGPROXY_HEADER_GUARD_1357924680)
***************
*** 63,66 ****
--- 22,26 ----
#include <xalanc/XPath/XPathDefinitions.hpp>
+ #include <xalanc/Include/XalanMemoryManagement.hpp>
***************
*** 79,88 ****
public:
! XObjectResultTreeFragProxy(const XObject& value);
virtual
~XObjectResultTreeFragProxy();
!
// These interfaces are inherited from XalanDocumentFragment...
--- 39,53 ----
public:
! XObjectResultTreeFragProxy(const XObject& value,
! MemoryManagerType& theManager);
virtual
~XObjectResultTreeFragProxy();
! MemoryManagerType&
! getMemoryManager()
! {
! return m_proxy.getMemoryManager();
! }
// These interfaces are inherited from XalanDocumentFragment...
Index: FunctionStartsWith.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionStartsWith.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionStartsWith.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionStartsWith.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONSTARTSWITH_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONSTARTSWITH_HEADER_GUARD_1357924680)
***************
*** 107,116 ****
virtual FunctionStartsWith*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 66,75 ----
virtual FunctionStartsWith*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XPathConstructionContextDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathConstructionContextDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathConstructionContextDefault.hpp 8 Apr 2004 07:57:08 -0000 1.1.1.1
--- XPathConstructionContextDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XPATHCONSTRUCTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHCONSTRUCTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680)
***************
*** 72,75 ****
--- 29,35 ----
+ /**
+ * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
+ */
// Base class header file...
#include <xalanc/XPath/XPathConstructionContext.hpp>
***************
*** 94,98 ****
* Construct an instance.
*/
! XPathConstructionContextDefault();
virtual
--- 54,61 ----
* Construct an instance.
*/
! XPathConstructionContextDefault(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
!
! static XPathConstructionContextDefault*
! create(MemoryManagerType& theManager);
virtual
***************
*** 115,118 ****
--- 78,93 ----
virtual bool
releaseCachedString(XalanDOMString& theString);
+
+ virtual void
+ error(
+ const XalanDOMString& msg,
+ const XalanNode* sourceNode,
+ const LocatorType* locator) const;
+
+ virtual void
+ warn(
+ const XalanDOMString& msg,
+ const XalanNode* sourceNode,
+ const LocatorType* locator) const;
private:
Index: XNull.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNull.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNull.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNull.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNULL_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNULL_HEADER_GUARD_1357924680)
***************
*** 81,84 ****
--- 40,55 ----
/**
+ * Perform static initialization. See class XPathInit.
+ */
+ static void
+ initialize();
+
+ /**
+ * Perform static shut down. See class XPathInit.
+ */
+ static void
+ terminate();
+
+ /**
* Create an XNull.
*
***************
*** 100,111 ****
// These methods are inherited from XObject ...
! #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
! virtual XObject*
! #else
! virtual XNull*
! #endif
! clone(void* theAddress = 0) const;
!
! virtual XalanDOMString
getTypeString() const;
--- 71,75 ----
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
***************
*** 138,141 ****
--- 102,107 ----
private:
+
+ static XalanDOMString s_nullString;
// not implemented
Index: XPathFunctionTable.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathFunctionTable.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathFunctionTable.hpp 8 Apr 2004 07:57:11 -0000 1.1.1.1
--- XPathFunctionTable.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHFUNCTIONTABLE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHFUNCTIONTABLE_HEADER_GUARD_1357924680)
***************
*** 93,111 ****
public:
! typedef Function::LocatorType LocatorType;
!
! XPathExceptionFunctionNotAvailable(int theFunctionNumber);
!
! XPathExceptionFunctionNotAvailable(const XalanDOMString& theFunctionName);
! XPathExceptionFunctionNotAvailable(
! int theFunctionNumber,
! const LocatorType& theLocator);
! XPathExceptionFunctionNotAvailable(
! const XalanDOMString& theFunctionName,
! const LocatorType& theLocator);
! ~XPathExceptionFunctionNotAvailable();
};
--- 52,66 ----
public:
! typedef Function::LocatorType LocatorType;
! XPathExceptionFunctionNotAvailable(const XalanDOMString& theFunctionNumber,
! XalanDOMString& theResult);
! XPathExceptionFunctionNotAvailable(
! const XalanDOMString& theFunctionNumber,
! const LocatorType& theLocator,
! XalanDOMString& theResult);
! ~XPathExceptionFunctionNotAvailable();
};
***************
*** 120,126 ****
public:
! XPathExceptionFunctionNotSupported(const XalanDOMChar* theFunctionName);
! ~XPathExceptionFunctionNotSupported();
};
--- 75,82 ----
public:
! XPathExceptionFunctionNotSupported(const XalanDOMChar* theFunctionName,
! XalanDOMString& theResult);
! ~XPathExceptionFunctionNotSupported();
};
***************
*** 134,506 ****
public:
! enum { InvalidFunctionNumberID = -1, TableSize = 36 };
! typedef size_t SizeType;
! typedef XalanDOMString::size_type StringSizeType;
! typedef DeleteFunctor<Function> DeleteFunctorType;
! /**
! * Constructor.
! *
! * @param fCreateTable If true, the internal table will be created. Otherwise, CreateTable() must be called.
! */
! XPathFunctionTable(bool fCreateTable = true);
! ~XPathFunctionTable();
! /**
! * Set up the internal table.
! */
! void
! CreateTable();
! /**
! * Destroy the internal table.
! */
! void
! DestroyTable();
! /**
! * Retrieve the function object for a specified function name.
! *
! * @param theFunctionName name of function
! * @return function named
! */
! const Function&
! operator[](const XalanDOMString& theFunctionName) const
! {
! const int theFunctionID =
! getFunctionIndex(theFunctionName);
! if (theFunctionID != InvalidFunctionNumberID)
! {
! return *m_functionTable[theFunctionID];
! }
! else
! {
! throw XPathExceptionFunctionNotAvailable(theFunctionName);
! }
! }
! /**
! * Retrieve the function object for a specified function ID number.
! *
! * @param theFunctionID ID number of the function
! * @return function named
! */
! const Function&
! operator[](int theFunctionID) const
! {
! assert(theFunctionID >= 0 && theFunctionID < TableSize);
! assert(m_functionTable[theFunctionID] != 0);
! return *m_functionTable[theFunctionID];
! }
! /**
! * Map a function ID to the corresponding name.
! *
! * @param theFunctionID The ID number of the function
! * @return The name of the function, or an empty string if the function doesn't exist.
! */
! const XalanDOMString
! idToName(int theFunctionID) const
! {
! XalanDOMString theName;
! if (theFunctionID >= 0 && theFunctionID < TableSize)
! {
! theName.assign(
! s_functionNames[theFunctionID].m_name,
! s_functionNames[theFunctionID].m_size);
! }
! return theName;
! }
! /**
! * Map a function name to the corresponding ID number.
! *
! * @param theName name of function
! * @return The ID number of function, or InvalidFunctionNumberID if the function doesn't exist.
! */
! int
! nameToID(const XalanDOMString& theName) const
! {
! return getFunctionIndex(theName);
! }
! /**
! * Insert a named function into the function table.
! *
! * @param theFunctionName name of function
! * @param theFunction function object corresponding to name
! */
! void
! InstallFunction(
! const XalanDOMString& theFunctionName,
! const Function& theFunction)
! {
! InstallFunction(theFunctionName.c_str(), theFunction);
! }
! /**
! * Remove a named function from the function table.
! *
! * @param theFunctionName name of function
! * @return true if the function was found and removed.
! */
! bool
! UninstallFunction(const XalanDOMString& theFunctionName)
! {
! return UninstallFunction(theFunctionName.c_str());
! }
! /**
! * Insert a named function into the function table.
! *
! * @param theFunctionName name of function
! * @param theFunction function object corresponding to name
! */
! void
! InstallFunction(
! const XalanDOMChar* theFunctionName,
! const Function& theFunction);
! /**
! * Remove a named function from the function table.
! *
! * @param theFunctionName name of function
! * @return true if the function was found and removed.
! */
! bool
! UninstallFunction(const XalanDOMChar* theFunctionName);
! /**
! * Whether a named function is in the function table.
! *
! * @param theFunctionName name of function
! * @return true if function is in table
! */
! bool
! isInstalledFunction(const XalanDOMString& theFunctionName) const
! {
! return getFunctionIndex(theFunctionName) != InvalidFunctionNumberID ? true : false;
! }
#if defined(XALAN_NO_MEMBER_TEMPLATES)
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<XalanDOMString> InstalledFunctionNameVectorType;
! #else
! typedef std::vector<XalanDOMString> InstalledFunctionNameVectorType;
! #endif
! /**
! * Add a list of the names of installed functions to a vector of names.
! *
! * @param theVector vector of function name strings added to
! */
! void
! getInstalledFunctionNames(InstalledFunctionNameVectorType& theVector) const
! {
! XalanDOMString theString;
! for (int i = 0; i < TableSize; ++i)
! {
! if (m_functionTable[i] != 0)
! {
! theString.assign(
! s_functionNames[i].m_name,
! s_functionNames[i].m_size);
! theVector.push_back(theString);
! }
! }
! }
#else
! /**
! * Add a list of the names of installed functions to a vector of names.
! *
! * @param theIterator function table iterator to append names to
! */
! template<class OutputIteratorType>
! void
! getInstalledFunctionNames(OutputIteratorType theIterator) const
! {
! XalanDOMString theString;
! for (int i = 0; i < TableSize; ++i)
! {
! if (m_functionTable[i] != 0)
! {
! theString.assign(
! s_functionNames[i].m_name,
! s_functionNames[i].m_size);
! *theIterator = theString;
! ++theIterator;
! }
! }
! }
#endif
! struct FunctionNameTableEntry
! {
! const XalanDOMChar* m_name;
! StringSizeType m_size;
! };
! // These are static strings for the functions supported.
! // Note that the XSLT functions are also here, since it's
! // just easier to do it this way.
! // The string "id"
! static const XalanDOMChar s_id[];
! // The string "key"
! static const XalanDOMChar s_key[];
! // The string "not"
! static const XalanDOMChar s_not[];
! // The string "sum"
! static const XalanDOMChar s_sum[];
! // The string "lang"
! static const XalanDOMChar s_lang[];
! // The string "last"
! static const XalanDOMChar s_last[];
! // The string "name"
! static const XalanDOMChar s_name[];
! // The string "true"
! static const XalanDOMChar s_true[];
! // The string "count"
! static const XalanDOMChar s_count[];
! // The string "false"
! static const XalanDOMChar s_false[];
! // The string "floor"
! static const XalanDOMChar s_floor[];
! // The string "round"
! static const XalanDOMChar s_round[];
! // The string "concat"
! static const XalanDOMChar s_concat[];
! // The string "number"
! static const XalanDOMChar s_number[];
! // The string "string"
! static const XalanDOMChar s_string[];
! // The string "boolean"
! static const XalanDOMChar s_boolean[];
! // The string "ceiling"
! static const XalanDOMChar s_ceiling[];
! // The string "current"
! static const XalanDOMChar s_current[];
! // The string "contains"
! static const XalanDOMChar s_contains[];
! // The string "document"
! static const XalanDOMChar s_document[];
! // The string "position"
! static const XalanDOMChar s_position[];
! // The string "substring"
! static const XalanDOMChar s_substring[];
! // The string "translate"
! static const XalanDOMChar s_translate[];
! // The string "local-name"
! static const XalanDOMChar s_localName[];
! // The string "generate-id"
! static const XalanDOMChar s_generateId[];
! // The string "starts-with"
! static const XalanDOMChar s_startsWith[];
! // The string "format-number"
! static const XalanDOMChar s_formatNumber[];
! // The string "namespace-uri"
! static const XalanDOMChar s_namespaceUri[];
! // The string "string-length"
! static const XalanDOMChar s_stringLength[];
! // The string "normalize-space"
! static const XalanDOMChar s_normalizeSpace[];
! // The string "substring-after"
! static const XalanDOMChar s_substringAfter[];
! // The string "system-property"
! static const XalanDOMChar s_systemProperty[];
! // The string "substring-before"
! static const XalanDOMChar s_substringBefore[];
! // The string "element-available"
! static const XalanDOMChar s_elementAvailable[];
! // The string "function-available"
! static const XalanDOMChar s_functionAvailable[];
! // The string "unparsed-entity-uri"
! static const XalanDOMChar s_unparsedEntityUri[];
! // A table of function names.
! static const FunctionNameTableEntry s_functionNames[];
! // The size of the table.
! static const SizeType s_functionNamesSize;
private:
! static int
! getFunctionIndex(const XalanDOMString& theName)
! {
! return getFunctionIndex(
! theName.c_str(),
! theName.length());
! }
! static int
! getFunctionIndex(const XalanDOMChar* theName)
! {
! return getFunctionIndex(
! theName,
! XalanDOMString::length(theName));
! }
! static int
! getFunctionIndex(
! const XalanDOMChar* theName,
! StringSizeType theNameLength);
! const Function* m_functionTable[TableSize];
! const Function** const m_functionTableEnd;
! // The last one in the table of function names.
! static const FunctionNameTableEntry* const s_lastFunctionName;
};
--- 90,468 ----
public:
! enum { InvalidFunctionNumberID = -1, TableSize = 36 };
! typedef size_t SizeType;
! typedef XalanDOMString::size_type StringSizeType;
! typedef DeleteFunctor<Function> DeleteFunctorType;
! /**
! * Constructor.
! *
! * @param fCreateTable If true, the internal table will be created. Otherwise, CreateTable() must be called.
! */
! XPathFunctionTable(bool fCreateTable = true);
! ~XPathFunctionTable();
! void
! setMemoryManager(MemoryManagerType& theManager)
! {
! m_memoryManager = &theManager;
! }
! /**
! * Set up the internal table.
! */
! void
! CreateTable();
! /**
! * Destroy the internal table.
! */
! void
! DestroyTable();
! /**
! * Retrieve the function object for a specified function name.
! *
! * @param theFunctionName name of function
! * @return function named
! */
! const Function&
! operator[](const XalanDOMString& theFunctionName) const
! {
! const int theFunctionID =
! getFunctionIndex(theFunctionName);
! if (theFunctionID != InvalidFunctionNumberID)
! {
! return *m_functionTable[theFunctionID];
! }
! else
! {
! MemoryManagerType* theManager = const_cast<MemoryManagerType*>(m_memoryManager);
! XalanDOMString theResult(*theManager);
! throw XPathExceptionFunctionNotAvailable(theFunctionName, theResult);
! }
! }
! /**
! * Retrieve the function object for a specified function ID number.
! *
! * @param theFunctionID ID number of the function
! * @return function named
! */
! const Function&
! operator[](int theFunctionID) const
! {
! assert(theFunctionID >= 0 && theFunctionID < TableSize);
! assert(m_functionTable[theFunctionID] != 0);
! return *m_functionTable[theFunctionID];
! }
! /**
! * Map a function ID to the corresponding name.
! *
! * @param theFunctionID The ID number of the function
! * @return The name of the function, or an empty string if the function doesn't exist.
! */
! const XalanDOMString&
! idToName(int theFunctionID,
! XalanDOMString& theResult) const
! {
! if (theFunctionID >= 0 && theFunctionID < TableSize)
! {
! theResult.assign(
! s_functionNames[theFunctionID].m_name,
! s_functionNames[theFunctionID].m_size);
! }
! return theResult;
! }
! /**
! * Map a function name to the corresponding ID number.
! *
! * @param theName name of function
! * @return The ID number of function, or InvalidFunctionNumberID if the function doesn't exist.
! */
! int
! nameToID(const XalanDOMString& theName) const
! {
! return getFunctionIndex(theName);
! }
! /**
! * Insert a named function into the function table.
! *
! * @param theFunctionName name of function
! * @param theFunction function object corresponding to name
! */
! void
! InstallFunction(
! const XalanDOMString& theFunctionName,
! const Function& theFunction)
! {
! InstallFunction(theFunctionName.c_str(), theFunction);
! }
! /**
! * Remove a named function from the function table.
! *
! * @param theFunctionName name of function
! * @return true if the function was found and removed.
! */
! bool
! UninstallFunction(const XalanDOMString& theFunctionName)
! {
! return UninstallFunction(theFunctionName.c_str());
! }
! /**
! * Insert a named function into the function table.
! *
! * @param theFunctionName name of function
! * @param theFunction function object corresponding to name
! */
! void
! InstallFunction(
! const XalanDOMChar* theFunctionName,
! const Function& theFunction);
!
! /**
! * Remove a named function from the function table.
! *
! * @param theFunctionName name of function
! * @return true if the function was found and removed.
! */
! bool
! UninstallFunction(const XalanDOMChar* theFunctionName);
!
! /**
! * Whether a named function is in the function table.
! *
! * @param theFunctionName name of function
! * @return true if function is in table
! */
! bool
! isInstalledFunction(const XalanDOMString& theFunctionName) const
! {
! return getFunctionIndex(theFunctionName) != InvalidFunctionNumberID ? true : false;
! }
#if defined(XALAN_NO_MEMBER_TEMPLATES)
! typedef XalanVector<XalanDOMString> InstalledFunctionNameVectorType;
! /**
! * Add a list of the names of installed functions to a vector of names.
! *
! * @param theVector vector of function name strings added to
! */
! void
! getInstalledFunctionNames(InstalledFunctionNameVectorType& theVector) const
! {
! XalanDOMString theString;
! for (int i = 0; i < TableSize; ++i)
! {
! if (m_functionTable[i] != 0)
! {
! theString.assign(
! s_functionNames[i].m_name,
! s_functionNames[i].m_size);
! theVector.push_back(theString);
! }
! }
! }
#else
! /**
! * Add a list of the names of installed functions to a vector of names.
! *
! * @param theIterator function table iterator to append names to
! */
! template<class OutputIteratorType>
! void
! getInstalledFunctionNames(OutputIteratorType theIterator) const
! {
! XalanDOMString theString(XalanMemMgrs::getDefaultXercesMemMgr());
! for (int i = 0; i < TableSize; ++i)
! {
! if (m_functionTable[i] != 0)
! {
! theString.assign(
! s_functionNames[i].m_name,
! s_functionNames[i].m_size);
! *theIterator = theString;
! ++theIterator;
! }
! }
! }
#endif
! struct FunctionNameTableEntry
! {
! const XalanDOMChar* m_name;
! StringSizeType m_size;
! };
! // These are static strings for the functions supported.
! // Note that the XSLT functions are also here, since it's
! // just easier to do it this way.
! // The string "id"
! static const XalanDOMChar s_id[];
! // The string "key"
! static const XalanDOMChar s_key[];
! // The string "not"
! static const XalanDOMChar s_not[];
! // The string "sum"
! static const XalanDOMChar s_sum[];
! // The string "lang"
! static const XalanDOMChar s_lang[];
! // The string "last"
! static const XalanDOMChar s_last[];
! // The string "name"
! static const XalanDOMChar s_name[];
! // The string "true"
! static const XalanDOMChar s_true[];
! // The string "count"
! static const XalanDOMChar s_count[];
! // The string "false"
! static const XalanDOMChar s_false[];
! // The string "floor"
! static const XalanDOMChar s_floor[];
! // The string "round"
! static const XalanDOMChar s_round[];
! // The string "concat"
! static const XalanDOMChar s_concat[];
! // The string "number"
! static const XalanDOMChar s_number[];
! // The string "string"
! static const XalanDOMChar s_string[];
! // The string "boolean"
! static const XalanDOMChar s_boolean[];
! // The string "ceiling"
! static const XalanDOMChar s_ceiling[];
! // The string "current"
! static const XalanDOMChar s_current[];
! // The string "contains"
! static const XalanDOMChar s_contains[];
! // The string "document"
! static const XalanDOMChar s_document[];
! // The string "position"
! static const XalanDOMChar s_position[];
! // The string "substring"
! static const XalanDOMChar s_substring[];
! // The string "translate"
! static const XalanDOMChar s_translate[];
! // The string "local-name"
! static const XalanDOMChar s_localName[];
! // The string "generate-id"
! static const XalanDOMChar s_generateId[];
! // The string "starts-with"
! static const XalanDOMChar s_startsWith[];
! // The string "format-number"
! static const XalanDOMChar s_formatNumber[];
! // The string "namespace-uri"
! static const XalanDOMChar s_namespaceUri[];
! // The string "string-length"
! static const XalanDOMChar s_stringLength[];
! // The string "normalize-space"
! static const XalanDOMChar s_normalizeSpace[];
! // The string "substring-after"
! static const XalanDOMChar s_substringAfter[];
! // The string "system-property"
! static const XalanDOMChar s_systemProperty[];
! // The string "substring-before"
! static const XalanDOMChar s_substringBefore[];
! // The string "element-available"
! static const XalanDOMChar s_elementAvailable[];
! // The string "function-available"
! static const XalanDOMChar s_functionAvailable[];
! // The string "unparsed-entity-uri"
! static const XalanDOMChar s_unparsedEntityUri[];
! // A table of function names.
! static const FunctionNameTableEntry s_functionNames[];
! // The size of the table.
! static const SizeType s_functionNamesSize;
private:
! static int
! getFunctionIndex(const XalanDOMString& theName)
! {
! return getFunctionIndex(
! theName.c_str(),
! theName.length());
! }
! static int
! getFunctionIndex(const XalanDOMChar* theName)
! {
! return getFunctionIndex(
! theName,
! XalanDOMString::length(theName));
! }
! static int
! getFunctionIndex(
! const XalanDOMChar* theName,
! StringSizeType theNameLength);
+ MemoryManagerType* m_memoryManager;
! const Function* m_functionTable[TableSize];
! const Function** const m_functionTableEnd;
! // The last one in the table of function names.
! static const FunctionNameTableEntry* const s_lastFunctionName;
};
***************
*** 511,513 ****
! #endif // XPATHFUNCTIONTABLE_HEADER_GUARD_1357924680
--- 473,475 ----
! #endif // XPATHFUNCTIONTABLE_HEADER_GUARD_1357924680
Index: XNumber.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNumber.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNumber.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNumber.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNUMBER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNUMBER_HEADER_GUARD_1357924680)
***************
*** 87,93 ****
* @param val numeric value to use
*/
! XNumber(double val);
! XNumber(const XNumber& source);
virtual
--- 46,53 ----
* @param val numeric value to use
*/
! XNumber(double val,
! MemoryManagerType& theManager);
! XNumber(const XNumber& source, MemoryManagerType& theManager);
virtual
***************
*** 96,106 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XNumber*
- #endif
- clone(void* theAddress = 0) const;
-
virtual double
num() const;
--- 56,59 ----
***************
*** 131,134 ****
--- 84,90 ----
private:
+ // not implemented
+ XNumber();
+ XNumber(const XNumber&);
// Value of the number being represented.
Index: XUnknown.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XUnknown.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XUnknown.hpp 8 Apr 2004 07:57:14 -0000 1.1.1.1
--- XUnknown.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XUKNOWN_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XUKNOWN_HEADER_GUARD_1357924680)
***************
*** 88,92 ****
*/
static void
! initialize();
/**
--- 47,51 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
***************
*** 101,107 ****
* @param name source string
*/
! XUnknown(const XalanDOMString& name);
! XUnknown(const XUnknown& source);
virtual
--- 60,69 ----
* @param name source string
*/
! XUnknown(const XalanDOMString& name, MemoryManagerType& theManager);
! XUnknown(const XUnknown& source, MemoryManagerType& theManager);
!
! static XUnknown*
! create(const XalanDOMString& name, MemoryManagerType& theManager);
virtual
***************
*** 109,121 ****
// These methods are inherited from XObject ...
!
! #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
! virtual XObject*
! #else
! virtual XUnknown*
! #endif
! clone(void* theAddress = 0) const;
!
! virtual XalanDOMString
getTypeString() const;
--- 71,75 ----
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
***************
*** 148,153 ****
private:
! const XalanDOMString m_value;
static XalanDOMString s_unknownString;
--- 102,110 ----
private:
+ // undefined
+ XUnknown(const XUnknown& source);
+ XUnknown();
! XalanDOMString m_value;
static XalanDOMString s_unknownString;
Index: XObjectResultTreeFragProxyText.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObjectResultTreeFragProxyText.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObjectResultTreeFragProxyText.hpp 8 Apr 2004 07:57:06 -0000 1.1.1.1
--- XObjectResultTreeFragProxyText.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECTRESULTTREEFRAGPROXYTEXT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECTRESULTTREEFRAGPROXYTEXT_HEADER_GUARD_1357924680)
***************
*** 63,66 ****
--- 22,27 ----
+ #include <xalanc/Include/XalanMemoryManagement.hpp>
+
#include <xalanc/XalanDOM/XalanText.hpp>
***************
*** 84,88 ****
*/
static void
! initialize();
/**
--- 45,49 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
***************
*** 97,106 ****
* @param theXObject The XObject instance for which this is a proxy.
*/
! XObjectResultTreeFragProxyText(const XObject& theXObject);
virtual
~XObjectResultTreeFragProxyText();
!
/**
* Gets the name of this node.
--- 58,72 ----
* @param theXObject The XObject instance for which this is a proxy.
*/
! XObjectResultTreeFragProxyText(const XObject& theXObject,
! MemoryManagerType& theManager);
virtual
~XObjectResultTreeFragProxyText();
! MemoryManagerType&
! getMemoryManager()
! {
! return m_MemoryManager;
! }
/**
* Gets the name of this node.
***************
*** 494,501 ****
* fit into a <code>DOMString</code>.
*/
! virtual XalanDOMString
substringData(
unsigned int offset,
! unsigned int count) const;
//@}
--- 460,468 ----
* fit into a <code>DOMString</code>.
*/
! virtual XalanDOMString&
substringData(
unsigned int offset,
! unsigned int count,
! XalanDOMString& theResult) const;
//@}
***************
*** 619,622 ****
--- 586,590 ----
const XObject& m_value;
+ MemoryManagerType& m_MemoryManager;
static const XalanDOMString& s_nameString;
};
Index: Function.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/Function.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Function.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- Function.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTION_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTION_HEADER_GUARD_1357924680)
***************
*** 63,66 ****
--- 22,26 ----
#include <xalanc/XPath/XPathDefinitions.hpp>
+ #include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
***************
*** 73,77 ****
-
XALAN_DECLARE_XERCES_CLASS(Locator)
--- 33,36 ----
***************
*** 204,208 ****
*/
virtual Function*
! clone() const = 0;
protected:
--- 163,167 ----
*/
virtual Function*
! clone(MemoryManagerType& theManager) const = 0;
protected:
***************
*** 215,220 ****
* @return function error message
*/
! virtual const XalanDOMString
! getError() const = 0;
private:
--- 174,179 ----
* @return function error message
*/
! virtual const XalanDOMString&
! getError(XalanDOMString& theBuffer) const = 0;
private:
Index: XPathParserException.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathParserException.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathParserException.hpp 8 Apr 2004 07:57:11 -0000 1.1.1.1
--- XPathParserException.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHPARSEREXCEPTION_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHPARSEREXCEPTION_HEADER_GUARD_1357924680)
***************
*** 94,98 ****
int theLineNumber,
int theColumnNumber,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
/**
--- 53,57 ----
int theLineNumber,
int theColumnNumber,
! MemoryManagerType& theManager);
/**
***************
*** 106,110 ****
const LocatorType& theLocator,
const XalanDOMString& theMessage,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
/**
--- 65,69 ----
const LocatorType& theLocator,
const XalanDOMString& theMessage,
! MemoryManagerType& theManager);
/**
***************
*** 116,123 ****
XPathParserException(
const XalanDOMString& theMessage,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
virtual
! ~XPathParserException();
};
--- 75,91 ----
XPathParserException(
const XalanDOMString& theMessage,
! MemoryManagerType& theManager);
virtual
! ~XPathParserException();
!
! virtual const XalanDOMChar*
! getType() const
! {
! return m_type;
! }
! private:
!
! static const XalanDOMChar m_type[];
};
Index: XPathAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathAllocator.hpp 8 Apr 2004 07:57:08 -0000 1.1.1.1
--- XPathAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 100,104 ****
* @param theBlockSize The block size.
*/
! XPathAllocator(size_type theBlockCount);
~XPathAllocator();
--- 59,63 ----
* @param theBlockSize The block size.
*/
! XPathAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XPathAllocator();
Index: FunctionNormalizeSpace.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionNormalizeSpace.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionNormalizeSpace.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionNormalizeSpace.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONNORMALIZE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONNORMALIZE_HEADER_GUARD_1357924680)
***************
*** 116,125 ****
virtual FunctionNormalizeSpace*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 75,84 ----
virtual FunctionNormalizeSpace*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XString.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XString.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XString.hpp 8 Apr 2004 07:57:12 -0000 1.1.1.1
--- XString.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSTRING_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSTRING_HEADER_GUARD_1357924680)
***************
*** 85,97 ****
* @param value source string
*/
! XString(const XalanDOMString& val);
! XString(const XalanDOMChar* val);
XString(
const XalanDOMChar* val,
! unsigned int len);
! XString(const XString& source);
virtual
--- 44,59 ----
* @param value source string
*/
! XString(const XalanDOMString& val,
! MemoryManagerType& theManager);
! XString(const XalanDOMChar* val,
! MemoryManagerType& theManager);
XString(
const XalanDOMChar* val,
! unsigned int len,
! MemoryManagerType& theManager);
! XString(const XString& source, MemoryManagerType& theManager);
virtual
***************
*** 106,116 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XString*
- #endif
- clone(void* theAddress = 0) const;
-
virtual const XalanDOMString&
str() const;
--- 68,71 ----
***************
*** 129,132 ****
--- 84,89 ----
private:
+ //not implemented
+ XString(const XString& source);
XalanDOMString m_value;
Index: XalanQNameByValueAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XalanQNameByValueAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanQNameByValueAllocator.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XalanQNameByValueAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 101,105 ****
* @param theBlockSize The block size.
*/
! XalanQNameByValueAllocator(size_type theBlockCount);
~XalanQNameByValueAllocator();
--- 60,64 ----
* @param theBlockSize The block size.
*/
! XalanQNameByValueAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanQNameByValueAllocator();
Index: XStringAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringAllocator.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XStringAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XStringAllocator(size_type theBlockCount);
~XStringAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XStringAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XStringAllocator();
***************
*** 128,141 ****
const XalanDOMChar* theString,
unsigned int theLength);
-
- /**
- * Clone an XString object.
- *
- * @param value source XString
- *
- * @return pointer to an XString
- */
- string_type*
- clone(const XString& value);
/**
--- 87,90 ----
Index: XObjectResultTreeFragProxyBase.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObjectResultTreeFragProxyBase.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObjectResultTreeFragProxyBase.hpp 8 Apr 2004 07:57:05 -0000 1.1.1.1
--- XObjectResultTreeFragProxyBase.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECTRESULTTREEFRAGPROXYBASE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECTRESULTTREEFRAGPROXYBASE_HEADER_GUARD_1357924680)
***************
*** 63,66 ****
--- 22,26 ----
#include <xalanc/XPath/XPathDefinitions.hpp>
+ #include <xalanc/Include/XalanMemoryManagement.hpp>
Index: ElementPrefixResolverProxy.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/ElementPrefixResolverProxy.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElementPrefixResolverProxy.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- ElementPrefixResolverProxy.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(ELEMENTPREFIXRESOLVERPROXY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(ELEMENTPREFIXRESOLVERPROXY_HEADER_GUARD_1357924680)
***************
*** 100,104 ****
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
! const DOMSupport& domSupport);
/**
--- 59,64 ----
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
! const DOMSupport& domSupport,
! MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
/**
***************
*** 111,114 ****
--- 71,75 ----
ElementPrefixResolverProxy(
const XalanElement* namespaceContext,
+ MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
const XPathEnvSupport* envSupport = 0);
***************
*** 125,128 ****
--- 86,91 ----
private:
+ //notimplemented
+ ElementPrefixResolverProxy(const ElementPrefixResolverProxy&);
const XalanElement* const m_namespaceContext;
Index: FunctionSubstringBefore.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionSubstringBefore.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionSubstringBefore.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionSubstringBefore.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONSUBSTRINGBEFORE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONSUBSTRINGBEFORE_HEADER_GUARD_1357924680)
***************
*** 107,116 ****
virtual FunctionSubstringBefore*
#endif
! clone() const;
protected:
!
! const XalanDOMString
! getError() const;
private:
--- 66,74 ----
virtual FunctionSubstringBefore*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: FunctionConcat.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionConcat.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionConcat.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- FunctionConcat.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONCONCAT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONCONCAT_HEADER_GUARD_1357924680)
***************
*** 123,132 ****
virtual FunctionConcat*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 82,91 ----
virtual FunctionConcat*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XPathDefinitions.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathDefinitions.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathDefinitions.hpp 8 Apr 2004 07:57:08 -0000 1.1.1.1
--- XPathDefinitions.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHDEFINITIONS_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHDEFINITIONS_HEADER_GUARD_1357924680)
Index: NodeRefList.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/NodeRefList.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NodeRefList.hpp 8 Apr 2004 07:57:02 -0000 1.1.1.1
--- NodeRefList.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(NODEREFLIST_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(NODEREFLIST_HEADER_GUARD_1357924680)
***************
*** 65,69 ****
! #include <vector>
--- 24,28 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 85,89 ****
explicit
! NodeRefList();
/**
--- 44,48 ----
explicit
! NodeRefList(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 92,96 ****
* @param theSource source node list
*/
! NodeRefList(const NodeRefList& theSource);
/**
--- 51,61 ----
* @param theSource source node list
*/
! NodeRefList(const NodeRefList& theSource, MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
!
! MemoryManagerType&
! getMemoryManager()
! {
! return m_nodeList.getMemoryManager();
! }
/**
***************
*** 100,104 ****
*/
explicit
! NodeRefList(const NodeRefListBase& theSource);
virtual
--- 65,69 ----
*/
explicit
! NodeRefList(const NodeRefListBase& theSource, MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
virtual
***************
*** 131,142 ****
#if !defined(NDEBUG)
bool
! checkForDuplicates() const;
#endif
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<XalanNode*> NodeListVectorType;
! #else
! typedef std::vector<XalanNode*> NodeListVectorType;
! #endif
void
--- 96,103 ----
#if !defined(NDEBUG)
bool
! checkForDuplicates(MemoryManagerType& theManager) const;
#endif
! typedef XalanVector<XalanNode*> NodeListVectorType;
void
***************
*** 169,172 ****
--- 130,139 ----
NodeListVectorType m_nodeList;
+ private:
+ #if defined (XALAN_DEVELOPMENT)
+ // not defined
+ NodeRefList();
+ NodeRefList(const NodeRefList& theSource);
+ #endif
};
Index: XTokenNumberAdapterAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XTokenNumberAdapterAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XTokenNumberAdapterAllocator.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XTokenNumberAdapterAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XTokenNumberAdapterAllocator(size_type theBlockCount);
~XTokenNumberAdapterAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XTokenNumberAdapterAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XTokenNumberAdapterAllocator();
***************
*** 106,118 ****
create(const XToken& theXToken);
- /**
- * Clone an object.
- *
- * @param theObject The source object
- *
- * @return A pointer to the new object
- */
- object_type*
- clone(const object_type& theObject);
/**
--- 65,68 ----
Index: FunctionNamespaceURI.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionNamespaceURI.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionNamespaceURI.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionNamespaceURI.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONNAMESPACEURI_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONNAMESPACEURI_HEADER_GUARD_1357924680)
***************
*** 120,129 ****
virtual FunctionNamespaceURI*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 79,88 ----
virtual FunctionNamespaceURI*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: FunctionSubstringAfter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionSubstringAfter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionSubstringAfter.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionSubstringAfter.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONSUBSTRINGAFTER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONSUBSTRINGAFTER_HEADER_GUARD_1357924680)
***************
*** 107,116 ****
virtual FunctionSubstringAfter*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 66,75 ----
virtual FunctionSubstringAfter*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XStringCachedAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringCachedAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringCachedAllocator.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XStringCachedAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 94,98 ****
* @param theBlockSize The block size.
*/
! XStringCachedAllocator(size_type theBlockCount);
~XStringCachedAllocator();
--- 53,57 ----
* @param theBlockSize The block size.
*/
! XStringCachedAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XStringCachedAllocator();
***************
*** 108,120 ****
createString(GetAndReleaseCachedString& theValue);
- /**
- * Clone an XStringCached object.
- *
- * @param value source XStringCached
- *
- * @return pointer to an XStringCached
- */
- string_type*
- clone(const string_type& value);
/**
--- 67,70 ----
Index: XPathProcessorImpl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathProcessorImpl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathProcessorImpl.hpp 8 Apr 2004 07:57:12 -0000 1.1.1.1
--- XPathProcessorImpl.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...1645 lines suppressed...]
! static const TableEntry s_nodeTypeTable[];
! static const size_type s_nodeTypeTableSize;
! static const TableEntry s_axisTable[];
! static const size_type s_axisTableSize;
!
! static const TableEntry s_dummyEntry;
};
***************
*** 885,887 ****
! #endif // XPATHPROCESSORIMPL_HEADER_GUARD_1357924680
--- 853,855 ----
! #endif // XPATHPROCESSORIMPL_HEADER_GUARD_1357924680
Index: XNodeSet.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNodeSet.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNodeSet.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XNodeSet.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNODESET_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNODESET_HEADER_GUARD_1357924680)
***************
*** 92,97 ****
* @param value Pointer to source node list. The XNodeSet will adopt the pointer.
*/
! XNodeSet(BorrowReturnMutableNodeRefList& value);
!
/**
* Create an XNodeSet from another.
--- 51,56 ----
* @param value Pointer to source node list. The XNodeSet will adopt the pointer.
*/
! XNodeSet(BorrowReturnMutableNodeRefList& value,
! MemoryManagerType& theManager);
/**
* Create an XNodeSet from another.
***************
*** 102,105 ****
--- 61,65 ----
XNodeSet(
const XNodeSet& source,
+ MemoryManagerType& theManager,
bool deepClone = false);
***************
*** 108,118 ****
// These methods are inherited from XNodeSetBase...
-
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XNodeSet*
- #endif
- clone(void* theAddress = 0) const;
virtual const NodeRefListBase&
--- 68,71 ----
Index: XPathFactoryBlock.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathFactoryBlock.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathFactoryBlock.hpp 8 Apr 2004 07:57:10 -0000 1.1.1.1
--- XPathFactoryBlock.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHFACTORYBLOCK_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHFACTORYBLOCK_HEADER_GUARD_1357924680)
***************
*** 86,90 ****
explicit
! XPathFactoryBlock(unsigned int theBlockSize = eDefaultBlockSize);
virtual
--- 45,49 ----
explicit
! XPathFactoryBlock(MemoryManagerType& theManager, unsigned int theBlockSize = eDefaultBlockSize);
virtual
Index: XTokenNumberAdapter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XTokenNumberAdapter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XTokenNumberAdapter.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XTokenNumberAdapter.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XTOKENNUMBERADAPTER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XTOKENNUMBERADAPTER_HEADER_GUARD_1357924680)
***************
*** 99,109 ****
// These methods are inherited from XObject ...
-
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XTokenNumberAdapter*
- #endif
- clone(void* theAddress = 0) const;
virtual double
--- 58,61 ----
Index: XPathEnvSupport.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathEnvSupport.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathEnvSupport.hpp 8 Apr 2004 07:57:08 -0000 1.1.1.1
--- XPathEnvSupport.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XPATHENVSUPPORT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHENVSUPPORT_HEADER_GUARD_1357924680)
***************
*** 67,75 ****
- #include <map>
- #include <vector>
-
-
-
// $$$ ToDo: Necessary while XalanDOMString is style a typedef.
#include <xalanc/XalanDOM/XalanDOMString.hpp>
--- 24,27 ----
***************
*** 93,96 ****
--- 45,51 ----
+ /**
+ * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
+ */
class NodeRefListBase;
class PrefixResolver;
***************
*** 127,130 ****
--- 82,86 ----
virtual XalanDocument*
parseXML(
+ MemoryManagerType& theManager,
const XalanDOMString& urlString,
const XalanDOMString& base) = 0;
***************
*** 157,162 ****
* @return document URI
*/
! virtual XalanDOMString
! findURIFromDoc(const XalanDocument* owner) const = 0;
/**
--- 113,118 ----
* @return document URI
*/
! virtual const XalanDOMString&
! findURIFromDoc(const XalanDocument* owner) const = 0;
/**
Index: FunctionContains.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionContains.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionContains.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- FunctionContains.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONCONTAINS_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONCONTAINS_HEADER_GUARD_1357924680)
***************
*** 107,116 ****
virtual FunctionContains*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 66,75 ----
virtual FunctionContains*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: FormatterStringLengthCounter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FormatterStringLengthCounter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FormatterStringLengthCounter.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- FormatterStringLengthCounter.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FORMATTERSTRINGLENGTHCOUNTER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FORMATTERSTRINGLENGTHCOUNTER_HEADER_GUARD_1357924680)
Index: XalanQName.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XalanQName.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanQName.hpp 8 Apr 2004 07:57:02 -0000 1.1.1.1
--- XalanQName.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALANQNAME_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALANQNAME_HEADER_GUARD_1357924680)
***************
*** 65,69 ****
! #include <deque>
--- 24,30 ----
! #include <xalanc/Include/XalanMap.hpp>
! #include <xalanc/Include/XalanDeque.hpp>
! #include <xalanc/Include/STLHelper.hpp>
***************
*** 104,118 ****
* unprefixed names."
*/
class XALAN_XPATH_EXPORT XalanQName
{
public:
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef deque<NameSpace> NamespaceVectorType;
! typedef deque<NamespaceVectorType> NamespacesStackType;
! #else
! typedef std::deque<NameSpace> NamespaceVectorType;
! typedef std::deque<NamespaceVectorType> NamespacesStackType;
! #endif
/**
--- 65,77 ----
* unprefixed names."
*/
+
class XALAN_XPATH_EXPORT XalanQName
{
public:
! typedef XalanDeque<NameSpace, ConstructWithMemoryManagerTraits<NameSpace> >
! NamespaceVectorType;
! typedef XalanDeque<NamespaceVectorType, ConstructWithMemoryManagerTraits<NamespaceVectorType> >
! NamespacesStackType;
/**
***************
*** 187,191 ****
hash() const
{
! return getLocalPart().hash() % getNamespace().hash();
}
--- 146,150 ----
hash() const
{
! return getLocalPart().hash() % (getNamespace().hash() + 1);
}
***************
*** 247,250 ****
--- 206,214 ----
const XalanDOMString& prefix);
+ static const XalanDOMString*
+ getNamespaceForPrefix(
+ const NamespacesStackType& nsStack,
+ const XalanDOMChar* prefix);
+
/**
* Get the namespace for a prefix by searching a range of iterators.
***************
*** 276,279 ****
--- 240,248 ----
const XalanDOMString& uri);
+ static const XalanDOMString*
+ getNamespaceForPrefix(
+ const NamespaceVectorType& namespaces,
+ const XalanDOMChar* prefix);
+
/**
* Get the prefix for a namespace by searching a stack of namespace
***************
*** 305,308 ****
--- 274,282 ----
const XalanDOMString& uri);
+ static const XalanDOMString*
+ getNamespaceForPrefix(
+ NamespacesStackType::const_iterator theBegin,
+ NamespacesStackType::const_iterator theEnd,
+ const XalanDOMChar* prefix);
/**
* Determine if the string supplied satisfies the grammar for
***************
*** 372,376 ****
const XalanDOMString& theURI,
int theLineNumber,
! int theColumnNumber);
/**
--- 346,351 ----
const XalanDOMString& theURI,
int theLineNumber,
! int theColumnNumber,
! XalanDOMString& theResult);
/**
***************
*** 385,389 ****
const LocatorType& theLocator,
const XalanDOMChar* theQName,
! XalanDOMString::size_type theQNameLength);
/**
--- 360,365 ----
const LocatorType& theLocator,
const XalanDOMChar* theQName,
! XalanDOMString::size_type theQNameLength,
! XalanDOMString& theResult);
/**
***************
*** 396,410 ****
InvalidQNameException(
const XalanDOMChar* theQName,
! XalanDOMString::size_type theQNameLength);
virtual
~InvalidQNameException();
private:
! static const XalanDOMString
format(
const XalanDOMChar* theQName,
! XalanDOMString::size_type theQNameLength);
};
--- 372,396 ----
InvalidQNameException(
const XalanDOMChar* theQName,
! XalanDOMString::size_type theQNameLength,
! XalanDOMString& theResult);
virtual
~InvalidQNameException();
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
private:
! static const XalanDOMChar m_type[];
!
! static const XalanDOMString&
format(
const XalanDOMChar* theQName,
! XalanDOMString::size_type theQNameLength,
! XalanDOMString& theResult);
};
***************
*** 415,419 ****
-
inline bool
operator==(
--- 401,404 ----
***************
*** 455,458 ****
--- 440,456 ----
}
+ template<>
+ struct XalanMapKeyTraits<XalanQName>
+ {
+ typedef XalanHashMemberReference<XalanQName> Hasher;
+ typedef XALAN_STD_QUALIFIER equal_to<XalanQName> Comparator;
+ };
+
+ template<>
+ struct XalanMapKeyTraits<const XalanQName*>
+ {
+ typedef XalanHashMemberPointer<XalanQName> Hasher;
+ typedef pointer_equal<XalanQName> Comparator;
+ };
Index: XPathProcessor.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathProcessor.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathProcessor.hpp 8 Apr 2004 07:57:11 -0000 1.1.1.1
--- XPathProcessor.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHPROCESSOR_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHPROCESSOR_HEADER_GUARD_1357924680)
***************
*** 107,110 ****
--- 66,71 ----
* @param resolver prefix resolver to use
* @param locator the LocatorType to use for error report. May be null
+ * @param allowVariableReferences If true, variable references are allowed.
+ * @param allowKeyFunction If true, calls to the key() function are allowed.
*/
virtual void
***************
*** 114,118 ****
const XalanDOMString& expression,
const PrefixResolver& resolver,
! const LocatorType* locator = 0) = 0;
/**
--- 75,81 ----
const XalanDOMString& expression,
const PrefixResolver& resolver,
! const LocatorType* locator = 0,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
***************
*** 124,127 ****
--- 87,92 ----
* @param resolver prefix resolver to use
* @param locator the LocatorType to use for error report. May be null
+ * @param allowVariableReferences If true, variable references are allowed.
+ * @param allowKeyFunction If true, calls to the key() function are allowed.
*/
virtual void
***************
*** 131,135 ****
const XalanDOMString& expression,
const PrefixResolver& resolver,
! const LocatorType* locator = 0) = 0;
/**
--- 96,102 ----
const XalanDOMString& expression,
const PrefixResolver& resolver,
! const LocatorType* locator = 0,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
Index: NodeRefListBase.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/NodeRefListBase.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NodeRefListBase.hpp 8 Apr 2004 07:57:02 -0000 1.1.1.1
--- NodeRefListBase.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(NODEREFLISTBASE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(NODEREFLISTBASE_HEADER_GUARD_1357924680)
***************
*** 90,98 ****
~NodeRefListBase();
! #if defined(XALAN_STRICT_ANSI_HEADERS)
! typedef std::size_t size_type;
! #else
! typedef size_t size_type;
! #endif
/**
--- 49,58 ----
~NodeRefListBase();
! //#if defined(XALAN_STRICT_ANSI_HEADERS)
! // typedef std::size_t size_type;
! //#else
! // typedef size_t size_type;
! //#endif
! typedef unsigned int size_type;
/**
Index: XToken.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XToken.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XToken.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XToken.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XTOKEN_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XTOKEN_HEADER_GUARD_1357924680)
***************
*** 86,90 ****
*/
explicit
! XToken(const XalanDOMString& theString);
/**
--- 45,50 ----
*/
explicit
! XToken(const XalanDOMString& theString,
! MemoryManagerType& theManager);
/**
***************
*** 103,114 ****
~XToken();
! #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
! virtual XObject*
! #else
! virtual XToken*
! #endif
! clone(void* theAddress = 0) const;
!
! virtual XalanDOMString
getTypeString() const;
--- 63,67 ----
~XToken();
! virtual const XalanDOMString&
getTypeString() const;
***************
*** 155,159 ****
*/
void
! set(const XalanDOMString& theString);
/**
--- 108,113 ----
*/
void
! set(const XalanDOMString& theString,
! MemoryManagerType& theManager);
/**
***************
*** 166,170 ****
set(
double theNumber,
! const XalanDOMString& theString);
protected:
--- 120,125 ----
set(
double theNumber,
! const XalanDOMString& theString,
! MemoryManagerType& theManager);
protected:
Index: FunctionID.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionID.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionID.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- FunctionID.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONID_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONID_HEADER_GUARD_1357924680)
***************
*** 65,72 ****
- #include <set>
-
-
-
#include <xalanc/XalanDOM/XalanElement.hpp>
#include <xalanc/XalanDOM/XalanNode.hpp>
--- 24,27 ----
***************
*** 127,136 ****
virtual FunctionID*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 82,91 ----
virtual FunctionID*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XObjectTypeCallback.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObjectTypeCallback.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObjectTypeCallback.hpp 8 Apr 2004 07:57:06 -0000 1.1.1.1
--- XObjectTypeCallback.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECT_TYPE_CALLBACK_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECT_TYPE_CALLBACK_HEADER_GUARD_1357924680)
***************
*** 94,98 ****
public:
! XObjectTypeCallback();
virtual
--- 53,57 ----
public:
! XObjectTypeCallback(MemoryManagerType& theManager);
virtual
***************
*** 177,180 ****
--- 136,147 ----
virtual void
Null(const XObject& theObject) = 0;
+
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_memoryManager;
+ }
+ private:
+ MemoryManagerType& m_memoryManager;
};
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathExecutionContextDefault.hpp 8 Apr 2004 07:57:09 -0000 1.1.1.1
--- XPathExecutionContextDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,62 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
! *
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XPATHEXECUTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
+ * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHEXECUTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680)
***************
*** 70,78 ****
- #include <deque>
-
-
-
#include <xalanc/Include/XalanObjectCache.hpp>
--- 24,29 ----
#include <xalanc/Include/XalanObjectCache.hpp>
+ #include <xalanc/Include/XalanVector.hpp>
***************
*** 82,85 ****
--- 33,39 ----
+ /**
+ * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
+ */
// Base class include file.
#include <xalanc/XPath/XPathExecutionContext.hpp>
***************
*** 113,123 ****
public:
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef deque<XalanNode*> CurrentNodeStackType;
! typedef deque<const NodeRefListBase*> ContextNodeListStackType;
! #else
! typedef std::deque<XalanNode*> CurrentNodeStackType;
! typedef std::deque<const NodeRefListBase*> ContextNodeListStackType;
! #endif
/**
--- 67,72 ----
public:
! typedef XalanVector<XalanNode*> CurrentNodeStackType;
! typedef XalanVector<const NodeRefListBase*> ContextNodeListStackType;
/**
***************
*** 150,153 ****
--- 99,110 ----
explicit
XPathExecutionContextDefault(
+ MemoryManagerType& theManager,
+ XalanNode* theCurrentNode = 0,
+ const NodeRefListBase* theContextNodeList = 0,
+ const PrefixResolver* thePrefixResolver = 0);
+
+ static XPathExecutionContextDefault*
+ create(
+ MemoryManagerType& theManager,
XalanNode* theCurrentNode = 0,
const NodeRefListBase* theContextNodeList = 0,
***************
*** 217,220 ****
--- 174,185 ----
}
+ virtual void doFormatNumber(
+ double number,
+ const XalanDOMString& pattern,
+ const XalanDecimalFormatSymbols* theDFS,
+ XalanDOMString& theResult,
+ const XalanNode* context = 0,
+ const LocatorType* locator = 0);
+
// These interfaces are inherited from XPathExecutionContext...
***************
*** 277,280 ****
--- 242,246 ----
virtual XalanDocument*
parseXML(
+ MemoryManagerType& theManager,
const XalanDOMString& urlString,
const XalanDOMString& base) const;
***************
*** 287,291 ****
virtual MutableNodeRefList*
! createMutableNodeRefList() const;
virtual XalanDOMString&
--- 253,257 ----
virtual MutableNodeRefList*
! createMutableNodeRefList(MemoryManagerType& theManager) const;
virtual XalanDOMString&
***************
*** 324,337 ****
getNamespaceForPrefix(const XalanDOMString& prefix) const;
! virtual XalanDOMString
findURIFromDoc(const XalanDocument* owner) const;
virtual const XalanDOMString&
getUnparsedEntityURI(
! const XalanDOMString& theName,
! const XalanDocument& theDocument) const;
virtual bool
! shouldStripSourceNode(const XalanNode& node);
virtual XalanDocument*
--- 290,303 ----
getNamespaceForPrefix(const XalanDOMString& prefix) const;
! virtual const XalanDOMString&
findURIFromDoc(const XalanDocument* owner) const;
virtual const XalanDOMString&
getUnparsedEntityURI(
! const XalanDOMString& theName,
! const XalanDocument& theDocument) const;
virtual bool
! shouldStripSourceNode(const XalanText& node);
virtual XalanDocument*
***************
*** 343,351 ****
XalanDocument* theDocument);
! virtual const XalanDecimalFormatSymbols*
! getDecimalFormatSymbols(const XalanQName& qname);
- // These interfaces are inherited from ExecutionContext...
virtual void
--- 309,329 ----
XalanDocument* theDocument);
! // These interfaces are inherited from ExecutionContext...
+ virtual void formatNumber(
+ double number,
+ const XalanDOMString& pattern,
+ XalanDOMString& theResult,
+ const XalanNode* context = 0,
+ const LocatorType* locator = 0);
+
+ virtual void formatNumber(
+ double number,
+ const XalanDOMString& pattern,
+ const XalanDOMString& dfsName,
+ XalanDOMString& theResult,
+ const XalanNode* context = 0,
+ const LocatorType* locator = 0);
virtual void
***************
*** 356,365 ****
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const;
-
- virtual void
warn(
const XalanDOMString& msg,
--- 334,337 ----
***************
*** 368,377 ****
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const;
-
- virtual void
message(
const XalanDOMString& msg,
--- 340,343 ----
***************
*** 379,391 ****
const LocatorType* locator = 0) const;
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const LocatorType* locator = 0) const;
-
protected:
! typedef XalanObjectCache<MutableNodeRefList, DefaultCacheCreateFunctor<MutableNodeRefList>, DeleteFunctor<MutableNodeRefList>, ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType;
enum { eNodeListCacheListSize = 50 };
--- 345,351 ----
const LocatorType* locator = 0) const;
protected:
! typedef XalanObjectCache<MutableNodeRefList, DefaultCacheCreateFunctorMemMgr<MutableNodeRefList>, DeleteFunctor<MutableNodeRefList>, ClearCacheResetFunctor<MutableNodeRefList> > NodeListCacheType;
enum { eNodeListCacheListSize = 50 };
***************
*** 433,437 ****
mutable XalanQNameByValue m_scratchQName;
! static const NodeRefList s_dummyList;
};
--- 393,397 ----
mutable XalanQNameByValue m_scratchQName;
! static const NodeRefList s_dummyList;
};
Index: XPathInit.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathInit.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathInit.hpp 8 Apr 2004 07:57:11 -0000 1.1.1.1
--- XPathInit.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 83,87 ****
explicit
! XPathInit();
~XPathInit();
--- 42,49 ----
explicit
! XPathInit(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
!
! static XPathInit*
! create(MemoryManagerType& theManager);
~XPathInit();
***************
*** 97,101 ****
static void
! initialize();
static void
--- 59,63 ----
static void
! initialize(MemoryManagerType& theManager);
static void
Index: XPathConstructionContext.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathConstructionContext.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathConstructionContext.hpp 8 Apr 2004 07:57:08 -0000 1.1.1.1
--- XPathConstructionContext.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XPATHCONSTRUCTIONCONTEXT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHCONSTRUCTIONCONTEXT_HEADER_GUARD_1357924680)
***************
*** 71,79 ****
--- 28,52 ----
+ XALAN_DECLARE_XERCES_CLASS(Locator)
+
+
+
XALAN_CPP_NAMESPACE_BEGIN
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+ XALAN_USING_XERCES(Locator)
+
+
+
+ class XalanNode;
+
+
+
//
+ /**
+ * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
+ */
// An abstract class which provides support for constructing the internal
// representation of a stylesheet.
***************
*** 83,197 ****
public:
! XPathConstructionContext();
! virtual
! ~XPathConstructionContext();
! /**
! * Reset the instance. Any existing objects
! * created by the instance will be destroyed.
! */
! virtual void
! reset() = 0;
! /**
! * Get a pooled string given the source string. If
! * the string already exists in the pool, no copy
! * will be made. If not, a copy will be made and
! * kept for later use.
! *
! * @param theString The source string
! * @return a const reference to a pooled string.
! */
! virtual const XalanDOMString&
! getPooledString(const XalanDOMString& theString) = 0;
! /**
! * Get a pooled string given the source character
! * array. If the string already exists in the pool,
! * no copy will be made. If not, a copy will be made
! * and kept for later use.
! *
! * @param theString The source character array
! * @param theLength The length of the character array
! * @return a const reference to a pooled string.
! */
! virtual const XalanDOMString&
! getPooledString(
! const XalanDOMChar* theString,
! XalanDOMString::size_type theLength = XalanDOMString::npos) = 0;
! /**
! * Get a cached string for temporary use.
! *
! * @return A reference to the string
! */
! virtual XalanDOMString&
! getCachedString() = 0;
! /**
! * Return a cached string.
! *
! * @param theString The string to release.
! *
! * @return true if the string was released successfully.
! */
! virtual bool
! releaseCachedString(XalanDOMString& theString) = 0;
! class GetAndReleaseCachedString
! {
! public:
! GetAndReleaseCachedString(XPathConstructionContext& theConstructionContext) :
! m_constructionContext(&theConstructionContext),
! m_string(&theConstructionContext.getCachedString())
! {
! }
! // Note non-const copy semantics...
! GetAndReleaseCachedString(GetAndReleaseCachedString& theSource) :
! m_constructionContext(theSource.m_constructionContext),
! m_string(theSource.m_string)
! {
! theSource.m_string = 0;
! }
! ~GetAndReleaseCachedString()
! {
! if (m_string != 0)
! {
! m_constructionContext->releaseCachedString(*m_string);
! }
! }
! XalanDOMString&
! get() const
! {
! assert(m_string != 0);
! return *m_string;
! }
! XPathConstructionContext&
! getConstructionContext() const
! {
! return *m_constructionContext;
! }
- private:
! // Not implemented...
! GetAndReleaseCachedString&
! operator=(const GetAndReleaseCachedString&);
- // Data members...
- XPathConstructionContext* m_constructionContext;
! XalanDOMString* m_string;
! };
};
--- 56,192 ----
public:
! XPathConstructionContext(MemoryManagerType& theManager);
! virtual
! ~XPathConstructionContext();
! /**
! * Reset the instance. Any existing objects
! * created by the instance will be destroyed.
! */
! virtual void
! reset() = 0;
! /**
! * Get a pooled string given the source string. If
! * the string already exists in the pool, no copy
! * will be made. If not, a copy will be made and
! * kept for later use.
! *
! * @param theString The source string
! * @return a const reference to a pooled string.
! */
! virtual const XalanDOMString&
! getPooledString(const XalanDOMString& theString) = 0;
! /**
! * Get a pooled string given the source character
! * array. If the string already exists in the pool,
! * no copy will be made. If not, a copy will be made
! * and kept for later use.
! *
! * @param theString The source character array
! * @param theLength The length of the character array
! * @return a const reference to a pooled string.
! */
! virtual const XalanDOMString&
! getPooledString(
! const XalanDOMChar* theString,
! XalanDOMString::size_type theLength = XalanDOMString::npos) = 0;
! /**
! * Get a cached string for temporary use.
! *
! * @return A reference to the string
! */
! virtual XalanDOMString&
! getCachedString() = 0;
! /**
! * Return a cached string.
! *
! * @param theString The string to release.
! *
! * @return true if the string was released successfully.
! */
! virtual bool
! releaseCachedString(XalanDOMString& theString) = 0;
! class GetAndReleaseCachedString
! {
! public:
! GetAndReleaseCachedString(XPathConstructionContext& theConstructionContext) :
! m_constructionContext(&theConstructionContext),
! m_string(&theConstructionContext.getCachedString())
! {
! }
! // Note non-const copy semantics...
! GetAndReleaseCachedString(GetAndReleaseCachedString& theSource) :
! m_constructionContext(theSource.m_constructionContext),
! m_string(theSource.m_string)
! {
! theSource.m_string = 0;
! }
! ~GetAndReleaseCachedString()
! {
! if (m_string != 0)
! {
! m_constructionContext->releaseCachedString(*m_string);
! }
! }
! XalanDOMString&
! get() const
! {
! assert(m_string != 0);
! return *m_string;
! }
! XPathConstructionContext&
! getConstructionContext() const
! {
! return *m_constructionContext;
! }
! private:
+ // Not implemented...
+ GetAndReleaseCachedString&
+ operator=(const GetAndReleaseCachedString&);
! // Data members...
! XPathConstructionContext* m_constructionContext;
+ XalanDOMString* m_string;
+ };
+
+ typedef GetAndReleaseCachedString GetCachedString;
+
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_memoryManager;
+ }
+
+ virtual void
+ error(
+ const XalanDOMString& msg,
+ const XalanNode* sourceNode,
+ const Locator* locator) const = 0;
+
+ virtual void
+ warn(
+ const XalanDOMString& msg,
+ const XalanNode* sourceNode,
+ const Locator* locator) const = 0;
+
+ MemoryManagerType& m_memoryManager;
};
***************
*** 202,204 ****
! #endif // XPATHCONSTRUCTIONCONTEXT_HEADER_GUARD_1357924680
--- 197,199 ----
! #endif // XPATHCONSTRUCTIONCONTEXT_HEADER_GUARD_1357924680
Index: XStringAdapterAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringAdapterAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringAdapterAllocator.hpp 8 Apr 2004 07:57:12 -0000 1.1.1.1
--- XStringAdapterAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XStringAdapterAllocator(size_type theBlockCount);
~XStringAdapterAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XStringAdapterAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XStringAdapterAllocator();
***************
*** 106,118 ****
createString(const XObjectPtr& theXObject);
- /**
- * Clone an XStringAdapter object.
- *
- * @param value source XStringAdapter
- *
- * @return pointer to an XStringAdapter
- */
- string_type*
- clone(const string_type& value);
/**
--- 65,68 ----
Index: XalanQNameByReference.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XalanQNameByReference.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanQNameByReference.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XalanQNameByReference.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALANQNAMEBYREFERENCE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALANQNAMEBYREFERENCE_HEADER_GUARD_1357924680)
***************
*** 171,174 ****
--- 130,140 ----
const XalanDOMString* m_localpart;
+ };
+
+
+
+ template<>
+ struct XalanMapKeyTraits<XalanQNameByReference> : public XalanMapKeyTraits<XalanQName>
+ {
};
Index: FunctionTranslate.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionTranslate.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionTranslate.hpp 8 Apr 2004 07:57:01 -0000 1.1.1.1
--- FunctionTranslate.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONTRANSLATE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONTRANSLATE_HEADER_GUARD_1357924680)
***************
*** 108,117 ****
virtual FunctionTranslate*
#endif
! clone() const;
protected:
!
! const XalanDOMString
! getError() const;
private:
--- 67,75 ----
virtual FunctionTranslate*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: NameSpace.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/NameSpace.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NameSpace.hpp 8 Apr 2004 07:57:02 -0000 1.1.1.1
--- NameSpace.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(NAMESPACE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(NAMESPACE_HEADER_GUARD_1357924680)
***************
*** 63,67 ****
#include <xalanc/XPath/XPathDefinitions.hpp>
!
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
--- 22,26 ----
#include <xalanc/XPath/XPathDefinitions.hpp>
! #include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
***************
*** 82,88 ****
explicit
! NameSpace() :
! m_prefix(),
! m_uri()
{
}
--- 41,47 ----
explicit
! NameSpace(MemoryManagerType& theManager) :
! m_prefix(theManager),
! m_uri(theManager)
{
}
***************
*** 97,105 ****
NameSpace(
const XalanDOMString& prefix,
! const XalanDOMString& uri) :
! m_prefix(prefix),
! m_uri(uri)
{
}
~NameSpace()
--- 56,90 ----
NameSpace(
const XalanDOMString& prefix,
! const XalanDOMString& uri,
! MemoryManagerType& theManager) :
! m_prefix(prefix, theManager),
! m_uri(uri, theManager)
! {
! }
!
! static NameSpace*
! create(
! const XalanDOMString& prefix,
! const XalanDOMString& uri,
! MemoryManagerType& theManager)
{
+ typedef NameSpace ThisType;
+
+ XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
+
+ ThisType* theResult = theGuard.get();
+
+ new (theResult) ThisType(prefix, uri, theManager);
+
+ theGuard.release();
+
+ return theResult;
}
+ NameSpace( const NameSpace& other,
+ MemoryManagerType& theManager) :
+ m_prefix(other.m_prefix, theManager),
+ m_uri(other.m_uri, theManager)
+ {
+ }
~NameSpace()
***************
*** 207,210 ****
--- 192,196 ----
private:
+ NameSpace(const NameSpace&);
XalanDOMString m_prefix;
***************
*** 213,217 ****
};
!
XALAN_CPP_NAMESPACE_END
--- 199,203 ----
};
! XALAN_USES_MEMORY_MANAGER(NameSpace)
XALAN_CPP_NAMESPACE_END
Index: XNodeSetNodeProxy.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNodeSetNodeProxy.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNodeSetNodeProxy.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNodeSetNodeProxy.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XNODESETNODEPROXY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XNODESETNODEPROXY_HEADER_GUARD_1357924680)
***************
*** 88,92 ****
* Create an XNodeSetNodeProxy
*/
! XNodeSetNodeProxy(XalanNode* theNode);
/**
--- 47,51 ----
* Create an XNodeSetNodeProxy
*/
! XNodeSetNodeProxy(MemoryManagerType& theManager, XalanNode* theNode);
/**
***************
*** 95,99 ****
* @param source object to copy
*/
! XNodeSetNodeProxy(const XNodeSetNodeProxy& source);
virtual
--- 54,58 ----
* @param source object to copy
*/
! XNodeSetNodeProxy(const XNodeSetNodeProxy& source, MemoryManagerType& theManager);
virtual
***************
*** 102,112 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XNodeSetNodeProxy*
- #endif
- clone(void* theAddress = 0) const;
-
virtual const NodeRefListBase&
nodeset() const;
--- 61,64 ----
***************
*** 150,153 ****
--- 102,106 ----
XNodeSetNodeProxy&
operator=(const XNodeSetNodeProxy&);
+ XNodeSetNodeProxy(const XNodeSetNodeProxy& source);
Index: XNodeSetAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNodeSetAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNodeSetAllocator.hpp 8 Apr 2004 07:57:03 -0000 1.1.1.1
--- XNodeSetAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 94,98 ****
* @param theBlockSize The block size.
*/
! XNodeSetAllocator(size_type theBlockCount);
~XNodeSetAllocator();
--- 53,57 ----
* @param theBlockSize The block size.
*/
! XNodeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XNodeSetAllocator();
***************
*** 108,120 ****
createNodeSet(BorrowReturnMutableNodeRefList& value);
- /**
- * Clone an XNodeSet object.
- *
- * @param value source XNodeSet
- *
- * @return pointer to an XNodeSet
- */
- nodeset_type*
- clone(const XNodeSet& value);
/**
--- 67,70 ----
Index: XStringCached.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XStringCached.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XStringCached.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XStringCached.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSTRINGCACHED_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSTRINGCACHED_HEADER_GUARD_1357924680)
***************
*** 91,97 ****
* @param theValue value used to create object
*/
! XStringCached(GetAndReleaseCachedString& val);
! XStringCached(const XStringCached& source);
virtual
--- 50,58 ----
* @param theValue value used to create object
*/
! XStringCached(GetAndReleaseCachedString& val,
! MemoryManagerType& theManager);
! XStringCached(const XStringCached& source,
! MemoryManagerType& theManager);
virtual
***************
*** 101,111 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XStringCached*
- #endif
- clone(void* theAddress = 0) const;
-
virtual const XalanDOMString&
str() const;
--- 62,65 ----
***************
*** 129,132 ****
--- 83,89 ----
private:
+ //Not implemented
+ XStringCached(const XStringCached& source);
+ XStringCached();
const GetAndReleaseCachedString m_value;
Index: XSpan.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XSpan.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSpan.hpp 8 Apr 2004 07:57:12 -0000 1.1.1.1
--- XSpan.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSPAN_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSPAN_HEADER_GUARD_1357924680)
***************
*** 83,99 ****
* @param value source node list. The instance will adopt the value instance.
*/
! XSpan(BorrowReturnMutableNodeRefList& value);
! XSpan(const XSpan& source);
virtual
~XSpan();
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XSpan*
- #endif
- clone(void* theAddress = 0) const;
/**
--- 42,52 ----
* @param value source node list. The instance will adopt the value instance.
*/
! XSpan(BorrowReturnMutableNodeRefList& value, MemoryManagerType& theManager);
! XSpan(const XSpan& source, MemoryManagerType& theManager);
virtual
~XSpan();
/**
Index: XNumberAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNumberAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNumberAllocator.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNumberAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XNumberAllocator(size_type theBlockCount);
~XNumberAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XNumberAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XNumberAllocator();
***************
*** 106,118 ****
createNumber(double theNumber);
- /**
- * Clone an XNumber object.
- *
- * @param value source XNumber
- *
- * @return pointer to an XNumber
- */
- number_type*
- clone(const XNumber& value);
/**
--- 65,68 ----
Index: MutableNodeRefList.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/MutableNodeRefList.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MutableNodeRefList.hpp 8 Apr 2004 07:57:02 -0000 1.1.1.1
--- MutableNodeRefList.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(MUTABLENODEREFLIST_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(MUTABLENODEREFLIST_HEADER_GUARD_1357924680)
***************
*** 91,96 ****
*/
explicit
! MutableNodeRefList();
/**
* Construct a mutable node list from another list.
--- 50,57 ----
*/
explicit
! MutableNodeRefList(MemoryManagerType& theManager);
+ static MutableNodeRefList*
+ create(MemoryManagerType& theManager);
/**
* Construct a mutable node list from another list.
***************
*** 98,102 ****
* @param theSource source list
*/
! MutableNodeRefList(const MutableNodeRefList& theSource);
/**
--- 59,64 ----
* @param theSource source list
*/
! MutableNodeRefList(const MutableNodeRefList& theSource,
! MemoryManagerType& theManager);
/**
***************
*** 106,110 ****
*/
explicit
! MutableNodeRefList(const NodeRefListBase& theSource);
virtual
--- 68,73 ----
*/
explicit
! MutableNodeRefList(const NodeRefListBase& theSource,
! MemoryManagerType& theManager);
virtual
***************
*** 250,261 ****
/**
- * Assign the nodes in reverse order into the supplied instance.
- *
- * @param nodelist The target node list.
- */
- void
- reverseAssign(MutableNodeRefList& nodelist) const;
-
- /**
* Reserve space for the supplied number of nodes.
* This is taken as an optimization, and may be
--- 213,216 ----
***************
*** 372,375 ****
--- 327,332 ----
private:
+ //not defined
+ MutableNodeRefList(const MutableNodeRefList& theSource);
// An enum to determine what the order of the nodes is...
***************
*** 379,383 ****
};
!
XALAN_CPP_NAMESPACE_END
--- 336,340 ----
};
! XALAN_USES_MEMORY_MANAGER(MutableNodeRefList)
XALAN_CPP_NAMESPACE_END
Index: FunctionLang.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/FunctionLang.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionLang.hpp 8 Apr 2004 07:57:00 -0000 1.1.1.1
--- FunctionLang.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONLANG_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONLANG_HEADER_GUARD_1357924680)
***************
*** 83,87 ****
typedef Function ParentType;
! FunctionLang();
virtual
--- 42,59 ----
typedef Function ParentType;
! /**
! * Perform static initialization. See class XPathInit.
! */
! static void
! initialize(MemoryManagerType& theManager);
!
! /**
! * Perform static shut down. See class XPathInit.
! */
! static void
! terminate();
!
!
! FunctionLang();
virtual
***************
*** 106,115 ****
virtual FunctionLang*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 78,87 ----
virtual FunctionLang*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
***************
*** 122,126 ****
operator==(const FunctionLang&) const;
! const XalanDOMString m_attributeName;
};
--- 94,98 ----
operator==(const FunctionLang&) const;
! static const XalanDOMString& s_attributeName;
};
Index: XNodeSetNodeProxyAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XNodeSetNodeProxyAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XNodeSetNodeProxyAllocator.hpp 8 Apr 2004 07:57:04 -0000 1.1.1.1
--- XNodeSetNodeProxyAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XNodeSetNodeProxyAllocator(size_type theBlockCount);
~XNodeSetNodeProxyAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XNodeSetNodeProxyAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XNodeSetNodeProxyAllocator();
Index: XPathEvaluator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathEvaluator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathEvaluator.hpp 8 Apr 2004 07:57:09 -0000 1.1.1.1
--- XPathEvaluator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHEVALUATOR_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHEVALUATOR_HEADER_GUARD_1357924680)
***************
*** 73,77 ****
! #include <xalanc/Include/XalanAutoPtr.hpp>
--- 32,36 ----
! #include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
***************
*** 114,118 ****
// you want to re-initialize the library.
static void
! initialize();
// Static terminator to be called after all instances
--- 73,77 ----
// you want to re-initialize the library.
static void
! initialize(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
// Static terminator to be called after all instances
***************
*** 124,128 ****
! XPathEvaluator();
~XPathEvaluator();
--- 83,87 ----
! XPathEvaluator(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
~XPathEvaluator();
***************
*** 210,215 ****
* @return A list of selected nodes.
*/
! NodeRefList
selectNodeList(
DOMSupport& domSupport,
XalanNode* contextNode,
--- 169,175 ----
* @return A list of selected nodes.
*/
! NodeRefList&
selectNodeList(
+ NodeRefList& result,
DOMSupport& domSupport,
XalanNode* contextNode,
***************
*** 227,232 ****
* @return A list of selected nodes.
*/
! NodeRefList
selectNodeList(
DOMSupport& domSupport,
XalanNode* contextNode,
--- 187,193 ----
* @return A list of selected nodes.
*/
! NodeRefList&
selectNodeList(
+ NodeRefList& result,
DOMSupport& domSupport,
XalanNode* contextNode,
***************
*** 244,249 ****
* @return A list of selected nodes.
*/
! NodeRefList
selectNodeList(
DOMSupport& domSupport,
XalanNode* contextNode,
--- 205,211 ----
* @return A list of selected nodes.
*/
! NodeRefList&
selectNodeList(
+ NodeRefList& result,
DOMSupport& domSupport,
XalanNode* contextNode,
***************
*** 261,266 ****
* @return A list of selected nodes.
*/
! NodeRefList
selectNodeList(
DOMSupport& domSupport,
XalanNode* contextNode,
--- 223,229 ----
* @return A list of selected nodes.
*/
! NodeRefList&
selectNodeList(
+ NodeRefList& result,
DOMSupport& domSupport,
XalanNode* contextNode,
***************
*** 271,277 ****
* Evaluate the supplied XPath expression, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the returned when the user's copy of the returned
! * XObjectPtr goes out of scope, or when the XPathEvaluator goes out of scope
! * or another expression is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
--- 234,240 ----
* Evaluate the supplied XPath expression, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the user's copy of the returned XObjectPtr goes out of
! * scope, or when the XPathEvaluator goes out of scope or another expression
! * is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
***************
*** 294,300 ****
* Evaluate the supplied XPath expression, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the returned when the user's copy of the returned
! * XObjectPtr goes out of scope, or when the XPathEvaluator goes out of scope
! * or another expression is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
--- 257,263 ----
* Evaluate the supplied XPath expression, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the user's copy of the returned XObjectPtr goes out of
! * scope, or when the XPathEvaluator goes out of scope or another expression
! * is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
***************
*** 315,323 ****
/**
! * Evaluate the supplied XPath, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the returned when the user's copy of the returned
! * XObjectPtr goes out of scope, or when the XPathEvaluator goes out of scope
! * or another expression is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
--- 278,286 ----
/**
! * Evaluate the supplied XPath expression, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the user's copy of the returned XObjectPtr goes out of
! * scope, or when the XPathEvaluator goes out of scope or another expression
! * is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
***************
*** 338,346 ****
/**
! * Evaluate the supplied XPath, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the returned when the user's copy of the returned
! * XObjectPtr goes out of scope, or when the XPathEvaluator goes out of scope
! * or another expression is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
--- 301,309 ----
/**
! * Evaluate the supplied XPath expression, within the given context. The
* result is returned as a generalized object. The object will be
! * destroyed when the user's copy of the returned XObjectPtr goes out of
! * scope, or when the XPathEvaluator goes out of scope or another expression
! * is evaluated.
*
* The user's XObjectPtr copy _must_ no longer be in scope when the XPathEvaluator
***************
*** 454,464 ****
// Data members...
! const XalanAutoPtr<XObjectFactory> m_xobjectFactory;
! const XalanAutoPtr<XPathFactoryDefault> m_xpathFactory;
! const XalanAutoPtr<XPathConstructionContextDefault> m_constructionContext;
! const XalanAutoPtr<XPathExecutionContextDefault> m_executionContext;
};
--- 417,429 ----
// Data members...
! const XalanMemMgrAutoPtr<XObjectFactory> m_xobjectFactory;
! const XalanMemMgrAutoPtr<XPathFactoryDefault> m_xpathFactory;
! const XalanMemMgrAutoPtr<XPathConstructionContextDefault> m_constructionContext;
! const XalanMemMgrAutoPtr<XPathExecutionContextDefault> m_executionContext;
!
! MemoryManagerType& m_memoryManager;
};
Index: XTokenStringAdapter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XTokenStringAdapter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XTokenStringAdapter.hpp 8 Apr 2004 07:57:13 -0000 1.1.1.1
--- XTokenStringAdapter.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XTOKENSTRINGADAPTER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XTOKENSTRINGADAPTER_HEADER_GUARD_1357924680)
***************
*** 91,97 ****
* @param theXToken The XToken instance to adapt
*/
! XTokenStringAdapter(const XToken& theToken);
! XTokenStringAdapter(const XTokenStringAdapter& source);
virtual
--- 50,58 ----
* @param theXToken The XToken instance to adapt
*/
! XTokenStringAdapter(const XToken& theToken,
! MemoryManagerType& theManager);
! XTokenStringAdapter(const XTokenStringAdapter& source,
! MemoryManagerType& theManager);
virtual
***************
*** 100,110 ****
// These methods are inherited from XObject ...
- #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XObject*
- #else
- virtual XTokenStringAdapter*
- #endif
- clone(void* theAddress = 0) const;
-
virtual double
num() const;
--- 61,64 ----
***************
*** 130,133 ****
--- 84,90 ----
private:
+ // Not implemented
+ XTokenStringAdapter(const XTokenStringAdapter& source);
+ XTokenStringAdapter();
// XToken instance that we're adapting...
Index: XObjectFactory.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XObjectFactory.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XObjectFactory.hpp 8 Apr 2004 07:57:05 -0000 1.1.1.1
--- XObjectFactory.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XOBJECTFACTORY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XOBJECTFACTORY_HEADER_GUARD_1357924680)
***************
*** 67,72 ****
#include <algorithm>
#include <cassert>
- #include <set>
-
--- 26,29 ----
***************
*** 100,104 ****
! XObjectFactory();
virtual
--- 57,61 ----
! XObjectFactory(MemoryManagerType& theManager);
virtual
***************
*** 106,109 ****
--- 63,72 ----
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_memoryManager;
+ }
+
/**
* Return an XObject to the factory.
***************
*** 329,337 ****
deleteObject(const XObject* theXObject) const
{
! #if defined(XALAN_CANNOT_DELETE_CONST)
! delete (XObject*)theXObject;
! #else
! delete theXObject;
! #endif
}
--- 292,305 ----
deleteObject(const XObject* theXObject) const
{
! if( theXObject!= 0)
! {
! XObject* theTmpXObject = const_cast<XObject*>(theXObject);
! MemoryManagerType& theManager = const_cast<MemoryManagerType&>(m_memoryManager);
!
! theTmpXObject->~XObject();
!
! theManager.deallocate((void*)theTmpXObject);
! }
!
}
***************
*** 358,361 ****
--- 326,331 ----
bool
operator==(const XObjectFactory&) const;
+
+ MemoryManagerType& m_memoryManager;
};
Index: XPathFactory.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XPath/XPathFactory.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XPathFactory.hpp 8 Apr 2004 07:57:10 -0000 1.1.1.1
--- XPathFactory.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XPATHFACTORY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XPATHFACTORY_HEADER_GUARD_1357924680)
***************
*** 63,67 ****
#include <xalanc/XPath/XPathDefinitions.hpp>
!
#include <cassert>
--- 22,26 ----
#include <xalanc/XPath/XPathDefinitions.hpp>
! #include <xalanc/Include/XalanMemoryManagement.hpp>
#include <cassert>
- Previous message: [GME-commit] GMESRC/GME/Include/xalanc/PlatformSupport ArenaBlockBase.hpp, NONE, 1.1 LocalMsgIndex.hpp, NONE, 1.1 XalanDOMStringReusableAllocator.hpp, NONE, 1.1 XalanMemoryManagerDefault.hpp, NONE, 1.1 ArenaAllocator.hpp, 1.1.1.1, 1.2 ArenaBlock.hpp, 1.1.1.1, 1.2 AttributeListImpl.hpp, 1.1.1.1, 1.2 AttributeVectorEntry.hpp, 1.1.1.1, 1.2 AttributeVectorEntryExtended.hpp, 1.1.1.1, 1.2 AttributesImpl.hpp, 1.1.1.1, 1.2 DOMStringHelper.hpp, 1.1.1.1, 1.2 DOMStringPrintWriter.hpp, 1.1.1.1, 1.2 DirectoryEnumerator.hpp, 1.1.1.1, 1.2 DoubleSupport.hpp, 1.1.1.1, 1.2 ExecutionContext.hpp, 1.1.1.1, 1.2 FormatterListener.hpp, 1.1.1.1, 1.2 NamedNodeMapAttributeList.hpp, 1.1.1.1, 1.2 NullPrintWriter.hpp, 1.1.1.1, 1.2 PlatformSupportDefinitions.hpp, 1.1.1.1, 1.2 PlatformSupportInit.hpp, 1.1.1.1, 1.2 PrefixResolver.hpp, 1.1.1.1, 1.2 PrintWriter.hpp, 1.1.1.1, 1.2 Resettable.hpp, 1.1.1.1, 1.2 ReusableArenaAllocator.hpp, 1.1.1.1, 1.2 ReusableArenaBlock.hpp, 1.1.1.1, 1.2 StdBinInputStream.hpp, 1.1.1.1, 1.2 StringTokenizer.hpp, 1.1.1.1, 1.2 URISupport.hpp , 1.1.1.1, 1.2 Writer.hpp, 1.1.1.1, 1.2 XSLException.hpp, 1.1.1.1, 1.2 XalanAllocator.hpp, 1.1.1.1, 1.2 XalanArrayAllocator.hpp, 1.1.1.1, 1.2 XalanBitmap.hpp, 1.1.1.1, 1.2 XalanCollationServices.hpp, 1.1.1.1, 1.2 XalanDOMStringAllocator.hpp, 1.1.1.1, 1.2 XalanDOMStringCache.hpp, 1.1.1.1, 1.2 XalanDOMStringHashTable.hpp, 1.1.1.1, 1.2 XalanDOMStringPool.hpp, 1.1.1.1, 1.2 XalanDecimalFormatSymbols.hpp, 1.1.1.1, 1.2 XalanEncodingPropertyCache.hpp, 1.1.1.1, 1.2 XalanFStreamOutputStream.hpp, 1.1.1.1, 1.2 XalanFileOutputStream.hpp, 1.1.1.1, 1.2 XalanICUMessageLoader.hpp, 1.1.1.1, 1.2 XalanInMemoryMessageLoader.hpp, 1.1.1.1, 1.2 XalanLocator.hpp, 1.1.1.1, 1.2 XalanMessageLoader.hpp, 1.1.1.1, 1.2 XalanNLSMessageLoader.hpp, 1.1.1.1, 1.2 XalanNamespace.hpp, 1.1.1.1, 1.2 XalanNullOutputStream.hpp, 1.1.1.1, 1.2 XalanNumberFormat.hpp, 1.1.1.1, 1.2 XalanOutputStream.hpp, 1.1.1.1, 1.2 XalanOutputStreamPrintWriter.hpp, 1.1.1.1, 1.2 XalanParsedURI.hpp, 1.1.1.1, 1.2 XalanReferenceCountedObject.hpp, 1.1.1.1, 1.2 XalanSimplePrefixResolver.hpp, 1.1.1 .1, 1.2 XalanStdOutputStream.hpp, 1.1.1.1, 1.2 XalanToXercesTranscoderWrapper.hpp, 1.1.1.1, 1.2 XalanTranscodingServices.hpp, 1.1.1.1, 1.2 XalanUTF16Transcoder.hpp, 1.1.1.1, 1.2 XalanUnicode.hpp, 1.1.1.1, 1.2 XalanXMLChar.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xalanc/XSLT XalanMatchPatternData.hpp, NONE, 1.1 XalanMatchPatternDataAllocator.hpp, NONE, 1.1 XalanSpaceNodeTester.hpp, NONE, 1.1 AVT.hpp, 1.1.1.1, 1.2 AVTPart.hpp, 1.1.1.1, 1.2 AVTPartSimple.hpp, 1.1.1.1, 1.2 AVTPartXPath.hpp, 1.1.1.1, 1.2 Constants.hpp, 1.1.1.1, 1.2 CountersTable.hpp, 1.1.1.1, 1.2 DecimalToRoman.hpp, 1.1.1.1, 1.2 ElemApplyImport.hpp, 1.1.1.1, 1.2 ElemApplyTemplates.hpp, 1.1.1.1, 1.2 ElemAttribute.hpp, 1.1.1.1, 1.2 ElemAttributeSet.hpp, 1.1.1.1, 1.2 ElemCallTemplate.hpp, 1.1.1.1, 1.2 ElemChoose.hpp, 1.1.1.1, 1.2 ElemComment.hpp, 1.1.1.1, 1.2 ElemCopy.hpp, 1.1.1.1, 1.2 ElemCopyOf.hpp, 1.1.1.1, 1.2 ElemDecimalFormat.hpp, 1.1.1.1, 1.2 ElemElement.hpp, 1.1.1.1, 1.2 ElemEmpty.hpp, 1.1.1.1, 1.2 ElemExtensionCall.hpp, 1.1.1.1, 1.2 ElemFallback.hpp, 1.1.1.1, 1.2 ElemForEach.hpp, 1.1.1.1, 1.2 ElemForwardCompatible.hpp, 1.1.1.1, 1.2 ElemIf.hpp, 1.1.1.1, 1.2 ElemLiteralResult.hpp, 1.1.1.1, 1.2 ElemMessage.hpp, 1.1.1.1, 1.2 ElemNumber.hpp, 1.1.1.1, 1.2 ElemOtherwise.hpp, 1.1.1.1, 1.2 ElemPI.hpp, 1.1.1.1 , 1.2 ElemParam.hpp, 1.1.1.1, 1.2 ElemSort.hpp, 1.1.1.1, 1.2 ElemTemplate.hpp, 1.1.1.1, 1.2 ElemTemplateElement.hpp, 1.1.1.1, 1.2 ElemText.hpp, 1.1.1.1, 1.2 ElemTextLiteral.hpp, 1.1.1.1, 1.2 ElemUse.hpp, 1.1.1.1, 1.2 ElemValueOf.hpp, 1.1.1.1, 1.2 ElemVariable.hpp, 1.1.1.1, 1.2 ElemWhen.hpp, 1.1.1.1, 1.2 ElemWithParam.hpp, 1.1.1.1, 1.2 ExtensionFunctionHandler.hpp, 1.1.1.1, 1.2 ExtensionNSHandler.hpp, 1.1.1.1, 1.2 FunctionCurrent.hpp, 1.1.1.1, 1.2 FunctionDocument.hpp, 1.1.1.1, 1.2 FunctionElementAvailable.hpp, 1.1.1.1, 1.2 FunctionFormatNumber.hpp, 1.1.1.1, 1.2 FunctionFunctionAvailable.hpp, 1.1.1.1, 1.2 FunctionGenerateID.hpp, 1.1.1.1, 1.2 FunctionKey.hpp, 1.1.1.1, 1.2 FunctionSystemProperty.hpp, 1.1.1.1, 1.2 FunctionUnparsedEntityURI.hpp, 1.1.1.1, 1.2 GenerateEvent.hpp, 1.1.1.1, 1.2 KeyDeclaration.hpp, 1.1.1.1, 1.2 KeyTable.hpp, 1.1.1.1, 1.2 NamespacesHandler.hpp, 1.1.1.1, 1.2 NodeSortKey.hpp, 1.1.1.1, 1.2 NodeSorter.hpp, 1.1.1.1, 1.2 OutputContextStack.hpp, 1.1.1.1, 1.2 ProblemListener.hpp, 1.1.1.1, 1.2 ProblemListenerDefault.hpp, 1 .1.1.1, 1.2 ResultNamespacesStack.hpp, 1.1.1.1, 1.2 SelectionEvent.hpp, 1.1.1.1, 1.2 Stylesheet.hpp, 1.1.1.1, 1.2 StylesheetConstructionContext.hpp, 1.1.1.1, 1.2 StylesheetConstructionContextDefault.hpp, 1.1.1.1, 1.2 StylesheetExecutionContext.hpp, 1.1.1.1, 1.2 StylesheetExecutionContextDefault.hpp, 1.1.1.1, 1.2 StylesheetHandler.hpp, 1.1.1.1, 1.2 StylesheetRoot.hpp, 1.1.1.1, 1.2 TopLevelArg.hpp, 1.1.1.1, 1.2 TraceListener.hpp, 1.1.1.1, 1.2 TraceListenerDefault.hpp, 1.1.1.1, 1.2 TracerEvent.hpp, 1.1.1.1, 1.2 VariablesStack.hpp, 1.1.1.1, 1.2 XResultTreeFrag.hpp, 1.1.1.1, 1.2 XResultTreeFragAllocator.hpp, 1.1.1.1, 1.2 XSLTDefinitions.hpp, 1.1.1.1, 1.2 XSLTEngineImpl.hpp, 1.1.1.1, 1.2 XSLTInit.hpp, 1.1.1.1, 1.2 XSLTInputSource.hpp, 1.1.1.1, 1.2 XSLTProcessor.hpp, 1.1.1.1, 1.2 XSLTProcessorEnvSupport.hpp, 1.1.1.1, 1.2 XSLTProcessorEnvSupportDefault.hpp, 1.1.1.1, 1.2 XSLTProcessorException.hpp, 1.1.1.1, 1.2 XSLTResultTarget.hpp, 1.1.1.1, 1.2 XalanAVTAllocator.hpp, 1.1.1.1, 1.2 XalanAVTPartSimpleAllocator.hpp, 1.1.1.1, 1.2 XalanAVTPar tXPathAllocator.hpp, 1.1.1.1, 1.2 XalanElemApplyTemplatesAllocator.hpp, 1.1.1.1, 1.2 XalanElemAttributeAllocator.hpp, 1.1.1.1, 1.2 XalanElemAttributeSetAllocator.hpp, 1.1.1.1, 1.2 XalanElemCallTemplateAllocator.hpp, 1.1.1.1, 1.2 XalanElemElementAllocator.hpp, 1.1.1.1, 1.2 XalanElemEmptyAllocator.hpp, 1.1.1.1, 1.2 XalanElemLiteralResultAllocator.hpp, 1.1.1.1, 1.2 XalanElemTemplateAllocator.hpp, 1.1.1.1, 1.2 XalanElemTextAllocator.hpp, 1.1.1.1, 1.2 XalanElemTextLiteralAllocator.hpp, 1.1.1.1, 1.2 XalanElemValueOfAllocator.hpp, 1.1.1.1, 1.2 XalanElemVariableAllocator.hpp, 1.1.1.1, 1.2 XalanNumberingResourceBundle.hpp, 1.1.1.1, 1.2 XalanSourceTreeDocumentAllocator.hpp, 1.1.1.1, 1.2 XalanSourceTreeDocumentFragmentAllocator.hpp, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list