cvs commit: xml-xalan/c/src/xalanc/Include AIXDefinitions.hpp

[mhoyt]

mhoyt       2004/11/12 09:26:25

  Modified:    c/src/xalanc/ICUBridge ICUFormatNumberFunctor.hpp
               c/src/xalanc/Include AIXDefinitions.hpp
  Log:
  Fix ICU-enabled AIX/xlC_r 6.0 build
  
  Revision  Changes    Path
  1.5       +7 -1      
xml-xalan/c/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp
  
  Index: ICUFormatNumberFunctor.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ICUFormatNumberFunctor.hpp        8 Nov 2004 18:06:19 -0000       1.4
  +++ ICUFormatNumberFunctor.hpp        12 Nov 2004 17:26:24 -0000      1.5
  @@ -116,6 +116,12 @@
   
           const XalanDecimalFormatSymbols * const      m_DFS;
       };
  +
  +private:
  +
  +    DecimalFormatCacheStruct();
  +    DecimalFormatCacheStruct(const DecimalFormatCacheStruct& other);
  +    
   };
   
   
  @@ -202,7 +208,7 @@
        bool
        operator==(const ICUFormatNumberFunctor&) const;
   private:
  -    mutable MemoryManagerType& m_memoryManager;
  +              MemoryManagerType& m_memoryManager;
   };
   
   XALAN_CPP_NAMESPACE_END
  
  
  
  1.8       +0 -3      xml-xalan/c/src/xalanc/Include/AIXDefinitions.hpp
  
  Index: AIXDefinitions.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/AIXDefinitions.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AIXDefinitions.hpp        6 Aug 2004 04:41:03 -0000       1.7
  +++ AIXDefinitions.hpp        12 Nov 2004 17:26:25 -0000      1.8
  @@ -33,9 +33,6 @@
   
   
   #define XALAN_LSTRSUPPORT
  -#if !defined(XML_BITSTOBUILD_64)
  -#define XALAN_USE_WCHAR_CAST_HACK
  -#endif
   #define XALAN_POSIX2_AVAILABLE
   #define XALAN_XALANDOMCHAR_USHORT_MISMATCH
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]