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 2005/05/05 02:34:47 UTC

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

dbertoni    2005/05/04 17:34:47

  Modified:    c/src/xalanc/Include XalanMemoryManagement.hpp
                        XalanVector.hpp
  Log:
  Fix for Jira issue XALANC-496.
  
  Revision  Changes    Path
  1.12      +3 -4      xml-xalan/c/src/xalanc/Include/XalanMemoryManagement.hpp
  
  Index: XalanMemoryManagement.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanMemoryManagement.hpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XalanMemoryManagement.hpp	22 Apr 2005 01:18:22 -0000	1.11
  +++ XalanMemoryManagement.hpp	5 May 2005 00:34:47 -0000	1.12
  @@ -369,15 +369,14 @@
   
   
   template <class C>
  -class ConstructValueWithNoMemoryManager 
  +struct ConstructValueWithNoMemoryManager 
   { 
  -public:
  -    ConstructValueWithNoMemoryManager(MemoryManagerType& /*mgr*/) 
  +    ConstructValueWithNoMemoryManager(MemoryManagerType& /*mgr*/) :
  +        value()
       {
       }
   
       C value;
  -
   };
   
   template <class C>
  
  
  
  1.13      +4 -3      xml-xalan/c/src/xalanc/Include/XalanVector.hpp
  
  Index: XalanVector.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanVector.hpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- XalanVector.hpp	12 Nov 2004 03:55:57 -0000	1.12
  +++ XalanVector.hpp	5 May 2005 00:34:47 -0000	1.13
  @@ -108,7 +108,8 @@
   
       typedef XalanVector<value_type, ConstructionTraits>     ThisType;
   
  -    typedef typename ConstructionTraits::Constructor Constructor;
  +    typedef typename ConstructionTraits::Constructor    Constructor;
  +    typedef typename Constructor::ConstructableType     ConstructibleType;
   
       XalanVector(
               MemoryManagerType&  theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR,
  @@ -588,9 +589,9 @@
       void
       resize(size_type   theSize)
       {
  -        typename ConstructionTraits::Constructor::ConstructableType defaultValue(*m_memoryManager);
  +        const ConstructibleType     defaultValue(*m_memoryManager);
   
  -        resize(theSize , defaultValue.value);
  +        resize(theSize, defaultValue.value);
       }
   
       void
  
  
  

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