You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by au...@locus.apache.org on 2000/11/27 14:35:05 UTC

cvs commit: xml-xalan/c/src/XSLT XalanTemplate.cpp

auriemma    00/11/27 05:35:03

  Modified:    c/src/XSLT XalanTemplate.cpp
  Log:
  Updates for AIX needed for the refcount xobject changes.
  
  Revision  Changes    Path
  1.11      +12 -10    xml-xalan/c/src/XSLT/XalanTemplate.cpp
  
  Index: XalanTemplate.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanTemplate.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XalanTemplate.cpp	2000/11/08 17:02:19	1.10
  +++ XalanTemplate.cpp	2000/11/27 13:34:59	1.11
  @@ -103,10 +103,12 @@
   #include <PlatformSupport/PrintWriter.hpp>
   #include <PlatformSupport/XalanOutputStream.hpp>
   #include <PlatformSupport/XalanUnicode.hpp>
  -#include <PlatformSupport/XalanTranscodingServices.hpp>	
  +#include <PlatformSupport/XalanTranscodingServices.hpp>
  +#include <PlatformSupport/XalanDOMStringCache.hpp>	
   
   
   
  +
   #include <DOMSupport/NamespaceResolver.hpp>
   #include <DOMSupport/NSInfo.hpp>
   
  @@ -181,6 +183,7 @@
   static XPathExpression::OpCodeLengthMapType theOpCodeLengthMapType;
   static XPathExpression::OpCodeMapValueType theOpCodeMapValueType;
   static XPathExpression::NodeTestSetType theNodeTestSetType;
  +static XPathExecutionContext::XObjectArgVectorType theVector;
   static XPathProcessorImpl::NodeTypesMapType theNodeTypesMapType;
   static Stylesheet::PatternTableListType	thePatternTableList;
   static Stylesheet::PatternTableVectorType thePatternTableVector;
  @@ -209,15 +212,6 @@
   			 XObjectFactoryDefault::DeleteXObjectFunctor(theFactory, true));
   	}
   	
  -	{		
  -		StylesheetExecutionContextDefault::LiveVariablesStackType 	theStack;
  -		XObjectFactoryDefault			theFactory;
  -		
  -		for_each(theStack.back().begin(),
  -			 theStack.back().end(),
  -			 XObjectFactoryDefault::DeleteXObjectFunctor(theFactory));
  -	}
  -	
   	{	
   		XPathFactoryDefault::CollectionType 	theVector;	
   		XPathFactoryDefault			theXPath;		
  @@ -233,6 +227,14 @@
   		for_each(theVector.begin(),
   			 theVector.end(),
   			 XPathFunctionTable::DeleteFunctorType());
  +	}
  +	
  +	{	
  +		XalanDOMStringCache::StringListType theVector;	
  +				
  +		for_each(theVector.begin(),
  +			 theVector.end(),
  +			 DeleteFunctor<XalanDOMString>());
   	}
   
   	{