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/11 17:31:03 UTC

cvs commit: xml-xalan/c/src/ICUBridge ICUBridgeCollationCompareFunctor.cpp

dbertoni    01/04/11 08:31:03

  Modified:    c/src/ICUBridge ICUBridgeCollationCompareFunctor.cpp
  Log:
  Added hack for platforms where it ICU uses wchar_t.
  
  Revision  Changes    Path
  1.12      +6 -2      xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.cpp
  
  Index: ICUBridgeCollationCompareFunctor.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctor.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ICUBridgeCollationCompareFunctor.cpp	2001/03/29 22:09:03	1.11
  +++ ICUBridgeCollationCompareFunctor.cpp	2001/04/11 15:31:02	1.12
  @@ -144,7 +144,11 @@
   {
   	UErrorCode	theStatus = U_ZERO_ERROR;
   
  +#if U_SIZEOF_WCHAR_T==2
  +	XalanAutoPtr<Collator>	theCollator(Collator::createInstance(Locale(UnicodeString(const theLocale)), theStatus));
  +#else
   	XalanAutoPtr<Collator>	theCollator(Collator::createInstance(Locale(UnicodeString(theLocale)), theStatus));
  +#endif
   
   	if (theStatus == U_ZERO_ERROR ||
   	    (theStatus >= U_ERROR_INFO_START && theStatus < U_ERROR_INFO_LIMIT))
  @@ -153,9 +157,9 @@
   
   #if U_SIZEOF_WCHAR_T==2
   		return theCollator->compare(
  -					(wchar_t*)theLHS,
  +					(const wchar_t*)theLHS,
   					length(theLHS),
  -					(wchar_t*)theRHS,
  +					(const wchar_t*)theRHS,
   					length(theRHS));
   #else
   		return theCollator->compare(
  
  
  

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