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/08/21 00:10:58 UTC

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

dbertoni    01/08/20 15:10:58

  Modified:    c/src/XSLT StylesheetExecutionContextDefault.hpp
                        StylesheetExecutionContextDefault.cpp
  Log:
  Updated for latest ICU changes.
  
  Revision  Changes    Path
  1.66      +3 -15     xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
  
  Index: StylesheetExecutionContextDefault.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- StylesheetExecutionContextDefault.hpp	2001/08/13 17:08:53	1.65
  +++ StylesheetExecutionContextDefault.hpp	2001/08/20 22:10:58	1.66
  @@ -648,13 +648,6 @@
   		virtual
   		~CollationCompareFunctor();
   
  -		// Non-const version is suitable for use by
  -		// a singe thread.
  -		virtual int
  -		operator()(
  -			const XalanDOMChar*		theLHS,
  -			const XalanDOMChar*		theRHS) = 0;
  -
   		// Const version is suitable for use by
   		// multiple threads.
   		virtual int
  @@ -683,11 +676,6 @@
   		virtual int
   		operator()(
   			const XalanDOMChar*		theLHS,
  -			const XalanDOMChar*		theRHS);
  -
  -		virtual int
  -		operator()(
  -			const XalanDOMChar*		theLHS,
   			const XalanDOMChar*		theRHS) const;
   
   		virtual int
  @@ -697,8 +685,8 @@
   			const XalanDOMChar*		theLocale) const;
   	};
   
  -	CollationCompareFunctor*
  -	installCollationCompareFunctor(CollationCompareFunctor*		theFunctor);
  +	const CollationCompareFunctor*
  +	installCollationCompareFunctor(const CollationCompareFunctor*	theFunctor);
   
   	virtual	bool
   	getInConstruction(const KeyDeclaration&		keyDeclaration) const;
  @@ -1040,7 +1028,7 @@
   
   	OutputStreamVectorType				m_outputStreams;
   
  -	CollationCompareFunctor*			m_collationCompareFunctor;
  +	const CollationCompareFunctor*		m_collationCompareFunctor;
   
   	/**
   	 * Holds all information about variables during execution.
  
  
  
  1.74      +3 -13     xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
  
  Index: StylesheetExecutionContextDefault.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- StylesheetExecutionContextDefault.cpp	2001/08/13 17:08:53	1.73
  +++ StylesheetExecutionContextDefault.cpp	2001/08/20 22:10:58	1.74
  @@ -1353,16 +1353,6 @@
   int
   StylesheetExecutionContextDefault::DefaultCollationCompareFunctor::operator()(
   			const XalanDOMChar*		theLHS,
  -			const XalanDOMChar*		theRHS)
  -{
  -	return ::collationCompare(theLHS, theRHS);
  -}
  -
  -
  -
  -int
  -StylesheetExecutionContextDefault::DefaultCollationCompareFunctor::operator()(
  -			const XalanDOMChar*		theLHS,
   			const XalanDOMChar*		theRHS) const
   {
   	return ::collationCompare(theLHS, theRHS);
  @@ -1381,12 +1371,12 @@
   
   
   
  -StylesheetExecutionContextDefault::CollationCompareFunctor*
  -StylesheetExecutionContextDefault::installCollationCompareFunctor(CollationCompareFunctor*	theFunctor)
  +const StylesheetExecutionContextDefault::CollationCompareFunctor*
  +StylesheetExecutionContextDefault::installCollationCompareFunctor(const CollationCompareFunctor*	theFunctor)
   {
   	assert(theFunctor != 0);
   
  -	CollationCompareFunctor* const	temp = m_collationCompareFunctor;
  +	const CollationCompareFunctor* const	temp = m_collationCompareFunctor;
   
   	m_collationCompareFunctor = theFunctor;
   
  
  
  

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