Return-Path: Delivered-To: apmail-xml-xalan-cvs-archive@www.apache.org Received: (qmail 76843 invoked from network); 5 May 2005 00:34:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 May 2005 00:34:58 -0000 Received: (qmail 97039 invoked by uid 500); 5 May 2005 00:37:03 -0000 Delivered-To: apmail-xml-xalan-cvs-archive@xml.apache.org Received: (qmail 96986 invoked by uid 500); 5 May 2005 00:37:02 -0000 Mailing-List: contact xalan-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: Delivered-To: mailing list xalan-cvs@xml.apache.org Received: (qmail 96843 invoked by uid 99); 5 May 2005 00:37:00 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 04 May 2005 17:36:59 -0700 Received: (qmail 76733 invoked by uid 1034); 5 May 2005 00:34:47 -0000 Date: 5 May 2005 00:34:47 -0000 Message-ID: <20050505003447.76732.qmail@minotaur.apache.org> From: dbertoni@apache.org To: xml-xalan-cvs@apache.org Subject: cvs commit: xml-xalan/c/src/xalanc/Include XalanMemoryManagement.hpp XalanVector.hpp X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 ConstructValueWithNoMemoryManager +struct ConstructValueWithNoMemoryManager { -public: - ConstructValueWithNoMemoryManager(MemoryManagerType& /*mgr*/) + ConstructValueWithNoMemoryManager(MemoryManagerType& /*mgr*/) : + value() { } C value; - }; template 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 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