You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2001/04/12 00:40:07 UTC

cvs commit: xml-xalan/c/src/XalanTransformer XalanTransformer.cpp XalanTransformer.hpp

dbertoni    01/04/11 15:40:07

  Modified:    c/src/XalanTransformer XalanTransformer.cpp
                        XalanTransformer.hpp
  Log:
  Removed const qualifier from vector typedefs.  Removed use of SetParamFunctor because of problems with AIX and OS/390 builds.
  
  Revision  Changes    Path
  1.14      +12 -29    xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
  
  Index: XalanTransformer.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XalanTransformer.cpp	2001/04/10 14:51:40	1.13
  +++ XalanTransformer.cpp	2001/04/11 22:40:03	1.14
  @@ -79,27 +79,6 @@
   
   
   
  -struct SetParamFunctor 
  -{
  -    SetParamFunctor(XSLTEngineImpl&		theProcessor):
  -        m_processor(theProcessor)
  -    {
  -    }
  -
  -	void
  -    operator()(const XalanTransformer::ParamPairType&	theParamPair) 
  -	{
  -       	// Set the stylesheet parameter.
  -	    m_processor.setStylesheetParam(
  -					theParamPair.first,  
  -					theParamPair.second);        
  -	}
  -
  -   	XSLTEngineImpl&		m_processor;
  -};
  -
  -
  -
   XalanTransformer::XalanTransformer():
   	m_stylesheetExecutionContext(),
   	m_compiledStylesheets(),
  @@ -219,10 +198,12 @@
   
   		m_stylesheetExecutionContext.setXSLTProcessor(&theProcessor);
   
  -        // Set the parameters.
  -	    for_each(m_paramPairs.begin(),
  -			     m_paramPairs.end(),
  -			     SetParamFunctor(theProcessor));
  +		for (ParamPairVectorType::size_type i = 0; i < m_paramPairs.size(); ++i)
  +		{
  +			theProcessor.setStylesheetParam(
  +					m_paramPairs[i].first,
  +					m_paramPairs[i].second);
  +		}
   
   		// Do the transformation...
   		theProcessor.process(
  @@ -369,10 +350,12 @@
   		// Set the compiled stylesheet.
   		theCompiledStylesheet->setStylesheetRoot(m_stylesheetExecutionContext);
   
  -		// Set the parameters.
  -	    for_each(m_paramPairs.begin(),
  -			     m_paramPairs.end(),
  -			     SetParamFunctor(theProcessor));
  +		for (ParamPairVectorType::size_type i = 0; i < m_paramPairs.size(); ++i)
  +		{
  +			theProcessor.setStylesheetParam(
  +					m_paramPairs[i].first,
  +					m_paramPairs[i].second);
  +		}
   
   		// Do the transformation...
   		theProcessor.process(
  
  
  
  1.17      +4 -3      xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp
  
  Index: XalanTransformer.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XalanTransformer.hpp	2001/04/10 14:51:49	1.16
  +++ XalanTransformer.hpp	2001/04/11 22:40:04	1.17
  @@ -129,7 +129,8 @@
   	
   	XalanTransformer();
   
  -	virtual ~XalanTransformer();
  +	virtual
  +	~XalanTransformer();
   
   	/**
   	 * Initialize Xalan.
  @@ -352,8 +353,8 @@
   
   
   #if defined(XALAN_NO_NAMESPACES)
  -	typedef vector<const XalanCompiledStylesheet*>		CompiledStylesheetPtrVectorType;
  -	typedef vector<const XalanParsedSource*>			ParsedSourcePtrVectorType;
  +	typedef vector<XalanCompiledStylesheet*>			CompiledStylesheetPtrVectorType;
  +	typedef vector<XalanParsedSource*>					ParsedSourcePtrVectorType;
   	typedef pair<XalanDOMString, XalanDOMString>    	ParamPairType;
   	typedef vector<ParamPairType>		                ParamPairVectorType;
   #else
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org