xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/ICUBridge ICUBridge.cpp ICUBridgeCollationCompareFunctorImpl.cpp ICUBridgeCollationCompareFunctorImpl.hpp ICUXalanNumberFormatProxy.hpp
Date Thu, 06 Feb 2003 22:31:52 GMT
dbertoni    2003/02/06 14:31:52

  Modified:    c/src/ICUBridge ICUBridge.cpp
                        ICUBridgeCollationCompareFunctorImpl.cpp
                        ICUBridgeCollationCompareFunctorImpl.hpp
                        ICUXalanNumberFormatProxy.hpp
  Log:
  Updates for new #defines.
  
  Revision  Changes    Path
  1.21      +1 -1      xml-xalan/c/src/ICUBridge/ICUBridge.cpp
  
  Index: ICUBridge.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridge.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ICUBridge.cpp	21 Jan 2003 02:23:21 -0000	1.20
  +++ ICUBridge.cpp	6 Feb 2003 22:31:52 -0000	1.21
  @@ -82,7 +82,7 @@
   
   
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
   	typedef vector<UChar>					UCharVectorType;
   #else
   	typedef std::vector<UChar>				UCharVectorType;
  
  
  
  1.7       +2 -6      xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp
  
  Index: ICUBridgeCollationCompareFunctorImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ICUBridgeCollationCompareFunctorImpl.cpp	23 Jan 2003 02:30:08 -0000	1.6
  +++ ICUBridgeCollationCompareFunctorImpl.cpp	6 Feb 2003 22:31:52 -0000	1.7
  @@ -157,9 +157,7 @@
   
   ICUBridgeCollationCompareFunctorImpl::~ICUBridgeCollationCompareFunctorImpl()
   {
  -#if !defined(XALAN_NO_NAMESPACES)
  -	using std::for_each;
  -#endif
  +	XALAN_USING_STD(for_each)
   
   	delete m_defaultCollator;
   
  @@ -434,9 +432,7 @@
   ICUBridgeCollationCompareFunctorImpl::CollatorType*
   ICUBridgeCollationCompareFunctorImpl::getCachedCollator(const XalanDOMChar*		theLocale)
const
   {
  -#if !defined(XALAN_NO_NAMESPACES)
  -	using std::find_if;
  -#endif
  +	XALAN_USING_STD(find_if)
   
   	CollatorCacheListType&		theNonConstCache =
   #if defined(XALAN_NO_MUTABLE)
  
  
  
  1.7       +4 -4      xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.hpp
  
  Index: ICUBridgeCollationCompareFunctorImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUBridgeCollationCompareFunctorImpl.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ICUBridgeCollationCompareFunctorImpl.hpp	7 Dec 2002 01:48:36 -0000	1.6
  +++ ICUBridgeCollationCompareFunctorImpl.hpp	6 Feb 2003 22:31:52 -0000	1.7
  @@ -116,10 +116,10 @@
   		return m_isValid;
   	}
   
  -#if defined(XALAN_NO_NAMESPACES)
  -	typedef Collator					CollatorType;
  -#else
  +#if defined(XALAN_HAS_CPP_NAMESPACE)
   	typedef U_ICU_NAMESPACE::Collator	CollatorType;
  +#else
  +	typedef Collator					CollatorType;
   #endif
   
   	struct CollationCacheStruct
  @@ -180,7 +180,7 @@
   		};
   	};
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
   	typedef list<CollationCacheStruct>			CollatorCacheListType;
   #else
   	typedef std::list<CollationCacheStruct>		CollatorCacheListType;
  
  
  
  1.7       +3 -3      xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.hpp
  
  Index: ICUXalanNumberFormatProxy.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/ICUBridge/ICUXalanNumberFormatProxy.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ICUXalanNumberFormatProxy.hpp	7 Dec 2002 01:48:36 -0000	1.6
  +++ ICUXalanNumberFormatProxy.hpp	6 Feb 2003 22:31:52 -0000	1.7
  @@ -142,10 +142,10 @@
   
   private:
   
  -#if defined(XALAN_NO_NAMESPACES)
  -	DecimalFormat*						m_decimalFormat;
  -#else
  +#if defined(XALAN_HAS_CPP_NAMESPACE)
   	U_ICU_NAMESPACE::DecimalFormat*		m_decimalFormat;
  +#else
  +	DecimalFormat*						m_decimalFormat;
   #endif
   };
   
  
  
  

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


Mime
View raw message