From xalanfrankmartin@example.com Mon Dec 08 19:16:55 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 66077 invoked from network); 8 Dec 2008 19:16:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Dec 2008 19:16:55 -0000
Received: (qmail 7401 invoked by uid 500); 8 Dec 2008 19:17:07 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 7389 invoked by uid 500); 8 Dec 2008 19:17:07 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 7380 invoked by uid 99); 8 Dec 2008 19:17:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 11:17:07 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 19:15:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 03D432388892; Mon,  8 Dec 2008 11:16:34 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724450 - in /xalan/c/trunk/src/xalanc:
 XPath/XPathConstructionContextDefault.hpp XSLT/ElemCopyOf.hpp
 XSLT/ExtensionFunctionHandler.hpp XSLT/NodeSortKey.hpp XSLT/NodeSorter.cpp
 XSLT/NodeSorter.hpp
Date: Mon, 08 Dec 2008 19:16:33 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec  8 11:16:33 2008
New Revision: 724450

URL: http://svn.apache.org/viewvc?rev=724450&view=rev
Log:
Removed obsolete author tags.

Modified:
    xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp
    xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
    xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp
    xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp
    xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp
    xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp

Modified: xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathConstructionContextDefault.hpp Mon Dec  8 11:16:33 2008
@@ -30,9 +30,6 @@
 
 
 
-/**
- * @author <a href="mailto:frankmartin@example.com">David N. Bertoni</a>
- */
 // Base class header file...
 #include <xalanc/XPath/XPathConstructionContext.hpp>
 

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemCopyOf.hpp Mon Dec  8 11:16:33 2008
@@ -18,11 +18,6 @@
 #if !defined(XALAN_ELEMCOPYOF_HEADER_GUARD)
 #define XALAN_ELEMCOPYOF_HEADER_GUARD 
 
-/**
- * @author David Bertoni (frankmartin@example.com)
- * @author Matthew Hoyt (frankmartin@example.com)
- */
-
 // Base include file.  Must be first.
 #include "XSLTDefinitions.hpp"
 

Modified: xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp Mon Dec  8 11:16:33 2008
@@ -54,8 +54,6 @@
 /**
  * Class handling an extension namespace for XPath. Provides functions
  * to test a function's existence and call a function
- *
- * @author Sanjiva Weerawarana (frankmartin@example.com)
  */
 class XALAN_XSLT_EXPORT ExtensionFunctionHandler 
 {

Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSortKey.hpp Mon Dec  8 11:16:33 2008
@@ -19,14 +19,6 @@
 #if !defined(XALAN_NODESORTKEY_HEADER_GUARD)
 #define XALAN_NODESORTKEY_HEADER_GUARD
 
-/**
- * 
- * @author Scott Boag (frankmartin@example.com)
- * @author David N. Bertoni (frankmartin@example.com)
- */
-
-
-
 // Base include file.  Must be first.
 #include "XSLTDefinitions.hpp"
 

Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp Mon Dec  8 11:16:33 2008
@@ -15,13 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * 
- * @author Scott Boag (frankmartin@example.com)
- * @author David N. Bertoni (frankmartin@example.com)
- */
-
-
 
 // Class header file.
 #include "NodeSorter.hpp"

Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp?rev=724450&r1=724449&r2=724450&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp Mon Dec  8 11:16:33 2008
@@ -18,12 +18,6 @@
 #if !defined(XALAN_NODESORTER_HEADER_GUARD)
 #define XALAN_NODESORTER_HEADER_GUARD
 
-/**
- * @author David N. Bertoni (frankmartin@example.com)
- */
-
- 
-
 // Base include file.  Must be first.
 #include "XSLTDefinitions.hpp"
 



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 08 19:18:29 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 66749 invoked from network); 8 Dec 2008 19:18:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Dec 2008 19:18:29 -0000
Received: (qmail 8987 invoked by uid 500); 8 Dec 2008 19:18:42 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 8973 invoked by uid 500); 8 Dec 2008 19:18:42 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 8964 invoked by uid 99); 8 Dec 2008 19:18:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 11:18:42 -0800
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 19:18:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7A43823888AF; Mon,  8 Dec 2008 11:18:06 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724452 - in /xalan/c/trunk: Tests/Conf/conf.cpp
 src/xalanc/Harness/XalanFileUtility.cpp
 src/xalanc/Harness/XalanFileUtility.hpp
Date: Mon, 08 Dec 2008 19:18:06 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec  8 11:18:06 2008
New Revision: 724452

URL: http://svn.apache.org/viewvc?rev=724452&view=rev
Log:
Return the error count from main() for the conf executable.

Modified:
    xalan/c/trunk/Tests/Conf/conf.cpp
    xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
    xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp

Modified: xalan/c/trunk/Tests/Conf/conf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Conf/conf.cpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Conf/conf.cpp (original)
+++ xalan/c/trunk/Tests/Conf/conf.cpp Mon Dec  8 11:18:06 2008
@@ -596,6 +596,8 @@
             logFile.close();
 
             h.analyzeResults(xalan, resultsFile);
+
+            theResult = h.getFailureCount();
         }
     }
     catch(const XalanDiagnosticMemoryManager888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4LockException&)

Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Mon Dec  8 11:18:06 2008
@@ -810,7 +810,6 @@
 
         // Todo: Need to determine if I should check for missing gold in these cases.
         logfile.logCheckFail(data.testOrFile, actexp);
-
     }
 }
 

Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp Mon Dec  8 11:18:06 2008
@@ -155,6 +155,12 @@
         m_verbose = flag;
     }
 
+    int
+    getFailureCount() const
+    {
+        return data.fail;
+    }
+
     /** 
     * Utility method used to get test files from a specific directory.
     * @returns a vector containing test files.
@@ -231,7 +237,6 @@
     XalanDOMString&
     getXercesVersion(XalanDOMString& theResult);
 
-
     void
     checkResults(
             const XalanDOMString&   outputFile, 
@@ -255,7 +260,7 @@
             const char*             actual,
             const char*             expected,
             const char*             msg,
-            XalanXMLFileReporter&        logfile,
+            XalanXMLFileReporter&   logfile,
             const XalanDOMString&   outputFile,
             const XalanDOMString&   goldFile,
             MemoryManager&          /* theManager */,
@@ -302,17 +307,18 @@
             const XalanCompiledStylesheet*  compiledSS,
             const XalanSourceTreeDocument*  dom,
             const XSLTInputSource&          goldInputSource,
-            XalanXMLFileReporter&                logfile);
+            XalanXMLFileReporter&           logfile);
 
     bool
     compareSerializedResults(
             const XalanDOMString&   transformResult,
             const XalanDOMString&   goldInputSource);
+
     /**
-    * Utility method used to create a FormatterToXML FormatterListener.
-    * This is required to DOM comparisions. 
-    * @returns a pointer to a FormatterListener.
-    */
+     * Utility method used to create a FormatterToXML FormatterListener.
+     * This is required to DOM comparisions. 
+     * @returns a pointer to a FormatterListener.
+     */
     FormatterListener* 
     getXMLFormatter(
             PrintWriter&            resultWriter,



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 08 20:56:13 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 5458 invoked from network); 8 Dec 2008 20:56:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Dec 2008 20:56:13 -0000
Received: (qmail 20183 invoked by uid 500); 8 Dec 2008 20:56:26 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 20131 invoked by uid 500); 8 Dec 2008 20:56:26 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 20122 invoked by uid 99); 8 Dec 2008 20:56:26 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 12:56:26 -0800
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 20:56:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 98593238889E; Mon,  8 Dec 2008 12:55:50 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724477 -
 /xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
Date: Mon, 08 Dec 2008 20:55:50 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec  8 12:55:50 2008
New Revision: 724477

URL: http://svn.apache.org/viewvc?rev=724477&view=rev
Log:
Fixed comment in header file.

Modified:
    xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp?rev=724477&r1=724476&r2=724477&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp Mon Dec  8 12:55:50 2008
@@ -46,13 +46,11 @@
     virtual
     ~XercesDOMSupport();
 
-    // These interfaces are inherited from Resettable...
+    // These interfaces are inherited from DOMSupport...
 
     virtual void
     reset();
 
-    // These interfaces are inherited from DOMSupport...
-
     virtual const XalanDOMString&
     getUnparsedEntityURI(
             const XalanDOMString&   theName,



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 08 20:58:09 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 5985 invoked from network); 8 Dec 2008 20:58:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Dec 2008 20:58:09 -0000
Received: (qmail 22488 invoked by uid 500); 8 Dec 2008 20:58:22 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 22471 invoked by uid 500); 8 Dec 2008 20:58:22 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 22462 invoked by uid 99); 8 Dec 2008 20:58:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 12:58:22 -0800
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 20:58:07 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EE313238889E; Mon,  8 Dec 2008 12:57:46 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724478 - /xalan/c/trunk/src/xalanc/Include/XalanVector.hpp
Date: Mon, 08 Dec 2008 20:57:46 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec  8 12:57:46 2008
New Revision: 724478

URL: http://svn.apache.org/viewvc?rev=724478&view=rev
Log:
Created a typedef for more clarity.  Added some comments.

Modified:
    xalan/c/trunk/src/xalanc/Include/XalanVector.hpp

Modified: xalan/c/trunk/src/xalanc/Include/XalanVector.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanVector.hpp?rev=724478&r1=724477&r2=724478&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanVector.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanVector.hpp Mon Dec  8 12:57:46 2008
@@ -93,17 +93,25 @@
     typedef XALAN_STD_QUALIFIER reverse_iterator<iterator>          reverse_iterator_;
     typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator>    const_reverse_iterator_;
 #elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
+    typedef XALAN_STD_QUALIFIER random_access_iterator_tag  iterator_category;
+
+    // This is a specific case for the Rogue Wave STL on Solaris.
     typedef XALAN_STD_QUALIFIER reverse_iterator<
         iterator,
-        XALAN_STD_QUALIFIER random_access_iterator_tag,
+        iterator_category,
         value_type> reverse_iterator_;
     typedef XALAN_STD_QUALIFIER reverse_iterator<
         const_iterator,
-        XALAN_STD_QUALIFIER random_access_iterator_tag,
+        iterator_category,
         const value_type> const_reverse_iterator_;
 #else
-    typedef XALAN_STD_QUALIFIER reverse_iterator<iterator, value_type>                          reverse_iterator_;
-    typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator, value_type, const_reference>   const_reverse_iterator_;
+    typedef XALAN_STD_QUALIFIER reverse_iterator<
+        iterator,
+        value_type>         reverse_iterator_;
+    typedef XALAN_STD_QUALIFIER reverse_iterator<
+        const_iterator,
+        value_type,
+        const_reference>    const_reverse_iterator_;
 #endif
 
     typedef reverse_iterator_           reverse_iterator;
@@ -818,6 +826,8 @@
                 }
                 else if (m_size < theRHS.m_size)
                 {
+                    // Insert the portion of theRHS that won't fit
+                    // at the end...
                     theRHSCopyEnd =
                         theRHS.begin() + m_size;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 08 20:59:24 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 6341 invoked from network); 8 Dec 2008 20:59:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Dec 2008 20:59:24 -0000
Received: (qmail 23863 invoked by uid 500); 8 Dec 2008 20:59:37 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 23848 invoked by uid 500); 8 Dec 2008 20:59:37 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 23837 invoked by uid 99); 8 Dec 2008 20:59:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 12:59:37 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 20:58:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EC208238889E; Mon,  8 Dec 2008 12:59:03 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724479 - /xalan/c/trunk/src/xalanc/Include/XalanList.hpp
Date: Mon, 08 Dec 2008 20:59:03 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec  8 12:59:03 2008
New Revision: 724479

URL: http://svn.apache.org/viewvc?rev=724479&view=rev
Log:
Removed obsolete author tag.  Used a typedef for more clarity and added some comments.

Modified:
    xalan/c/trunk/src/xalanc/Include/XalanList.hpp

Modified: xalan/c/trunk/src/xalanc/Include/XalanList.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanList.hpp?rev=724479&r1=724478&r2=724479&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanList.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanList.hpp Mon Dec  8 12:59:03 2008
@@ -16,10 +16,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Matthew Hoyt (frankmartin@example.com)
- */
-
 #if !defined(XALANLIST_HEADER_GUARD_1357924680)
 #define XALANLIST_HEADER_GUARD_1357924680
 
@@ -188,24 +184,33 @@
     };
 
     typedef XalanListIteratorBase<XalanListIteratorTraits<value_type>, Node>        iterator;
-    
     typedef XalanListIteratorBase<XalanListConstIteratorTraits<value_type>, Node>   const_iterator;
-            
+
 #if defined(XALAN_HAS_STD_ITERATORS)
-    typedef XALAN_STD_QUALIFIER reverse_iterator<iterator>  reverse_iterator_;
+    typedef XALAN_STD_QUALIFIER reverse_iterator<iterator>          reverse_iterator_;
     typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator>    const_reverse_iterator_;
 #elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
+    typedef typename iterator888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4iterator_category    iterator_category;
+
+    // This is a specific case for the Rogue Wave STL on Solaris.
     typedef XALAN_STD_QUALIFIER reverse_iterator<
         iterator,
-        XALAN_STD_QUALIFIER bidirectional_iterator_tag,
-        value_type> reverse_iterator_;
+        iterator_category,
+        value_type>         reverse_iterator_;
+
     typedef XALAN_STD_QUALIFIER reverse_iterator<
         const_iterator,
-        XALAN_STD_QUALIFIER bidirectional_iterator_tag,
-        const value_type> const_reverse_iterator_;
+        iterator_category,
+        const value_type>   const_reverse_iterator_;
 #else
-    typedef XALAN_STD_QUALIFIER reverse_iterator<iterator, value_type>                          reverse_iterator_;
-    typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator, value_type, const_reference>   const_reverse_iterator_;
+    typedef XALAN_STD_QUALIFIER reverse_iterator<
+        iterator,
+        value_type>         reverse_iterator_;
+
+    typedef XALAN_STD_QUALIFIER reverse_iterator<
+        const_iterator,
+        value_type,
+        const_reference>    const_reverse_iterator_;
 #endif
 
     typedef reverse_iterator_           reverse_iterator;



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 08 21:05:11 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 8099 invoked from network); 8 Dec 2008 21:05:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 8 Dec 2008 21:05:11 -0000
Received: (qmail 34624 invoked by uid 500); 8 Dec 2008 21:05:23 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 34610 invoked by uid 500); 8 Dec 2008 21:05:23 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 34601 invoked by uid 99); 8 Dec 2008 21:05:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 13:05:23 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 21:04:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5029A238893B; Mon,  8 Dec 2008 13:04:50 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724482 - /xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
Date: Mon, 08 Dec 2008 21:04:50 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec  8 13:04:49 2008
New Revision: 724482

URL: http://svn.apache.org/viewvc?rev=724482&view=rev
Log:
Removed obsolete author tag. Fixed assignment operator to protect against self-assignment. Updated XalanDequeIterator and XalanDeque to avoid exposing data members.  Fixed some issues where exceptions might cause memory leaks. Used a typedef for better clarity, and added and updated some comments.

Modified:
    xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp

Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=724482&r1=724481&r2=724482&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Mon Dec  8 13:04:49 2008
@@ -16,10 +16,6 @@
  * limitations under the License.
  */
 
-/**
- * @author Matthew Hoyt (frankmartin@example.com)
- */
-
 #if !defined(XALANDEQUE_HEADER_GUARD_1357924680)
 #define XALANDEQUE_HEADER_GUARD_1357924680
 
@@ -57,107 +53,144 @@
     typedef const Value&    const_reference;
 };
 
-template <class XalanDequeTraits, class XalanDeque>
-struct  XalanDequeIterator
+template <class Traits, class XalanDeque>
+class XalanDequeIterator
 {
-    typedef size_t  size_type;
-    typedef typename XalanDequeTraits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4value_type       value_type;
-    typedef typename XalanDequeTraits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reference        reference;
-    typedef typename XalanDequeTraits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4pointer          pointer;
-    typedef typename XalanDequeTraits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onst_reference  const_reference;
-    typedef ptrdiff_t                                   difference_type;
-
-    typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, XalanDeque> Iterator;
-
-    typedef XALAN_STD_QUALIFIER random_access_iterator_tag iterator_category;
+public:
 
-    XalanDequeIterator(XalanDeque*  deque,
-                       size_type    pos) :
+    typedef size_t                              size_type;
+    typedef typename Traits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4value_type         value_type;
+    typedef typename Traits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reference          reference;
+    typedef typename Traits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4pointer            pointer;
+    typedef typename Traits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onst_reference    const_reference;
+    typedef ptrdiff_t                           difference_type;
+
+    typedef XALAN_STD_QUALIFIER random_access_iterator_tag  iterator_category;
+
+    // The non-const iterator type.  In the case of the non-const instatiation, this
+    // is the same type.
+    typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, XalanDeque>    Iterator;
+
+    // The const version needs access to our private data members for copy construction and
+    // assignment.  For the const instantiation, this is a superfluous friend declaration,
+    // since it's the same type as the class itself.
+    friend class XalanDequeIterator<XalanDequeConstIteratorTraits<value_type>, XalanDeque>;
+
+    XalanDequeIterator(
+                XalanDeque*     deque,
+                size_type       pos) :
         m_deque(deque),
         m_pos(pos)
     {
     }
 
-    XalanDequeIterator(const Iterator & iterator) :
+    // The is standard copy-construction for the non-const iterator type.  For the
+    // const iterator type, this is copy construction from the non-const type, and the
+    // compiler will generate the standard copy constructor.
+    XalanDequeIterator(const Iterator&  iterator) :
         m_deque(iterator.m_deque),
         m_pos(iterator.m_pos)
     {
     }
 
-    XalanDequeIterator& operator=(const Iterator & iterator)
+    // The is the standard assignment operator for the non-const iterator type.
+    // For the const iterator type, this is the assignment operator from the
+    // non-const type, and the compiler will generate the standard assignment
+    // operator.
+    XalanDequeIterator&
+    operator=(const Iterator&   iterator)
     {
         m_deque = iterator.m_deque;
         m_pos = iterator.m_pos;
+
         return *this;
     }
 
-    XalanDequeIterator& operator++()
+    XalanDequeIterator&
+    operator++()
     {
         ++m_pos;
+
         return *this;
     }
 
-    XalanDequeIterator operator++(int)
+    XalanDequeIterator
+    operator++(int)
     {
         XalanDequeIterator temp = *this;
         ++m_pos;
+
         return temp;
     }
 
-    XalanDequeIterator& operator--()
+    XalanDequeIterator&
+    operator--()
     {   
         --m_pos;
+
         return *this;
     }
 
-    pointer operator->()
+    pointer
+    operator->()
     {
         return &(*m_deque[m_pos]);
     }
 
-    reference operator*()
+    reference
+    operator*()
     {
         return (*m_deque)[m_pos];
     }
 
-    const_reference operator*() const
+    const_reference
+    operator*() const
     {
         return (*m_deque)[m_pos];
     }
 
-    XalanDequeIterator operator+(difference_type difference) const
+    XalanDequeIterator
+    operator+(difference_type   difference) const
     {
         return XalanDequeIterator(m_deque, m_pos + difference);
     }
 
-    XalanDequeIterator operator-(difference_type difference) const
+    XalanDequeIterator
+    operator-(difference_type   difference) const
     {
         return XalanDequeIterator(m_deque, m_pos - difference);
     }
 
-    difference_type operator-(const XalanDequeIterator &theRhs) const
+    difference_type
+    operator-(const XalanDequeIterator&     theRHS) const
     {
-        return m_pos - theRhs.m_pos;
+        return m_pos - theRHS.m_pos;
     }
 
-    bool operator==(const XalanDequeIterator & theRhs) const
+    bool
+    operator==(const XalanDequeIterator&    theRHS) const
     {
-        return (theRhs.m_deque == m_deque)
-            &&  theRhs.m_pos == m_pos;
+        return theRHS.m_deque == m_deque &&
+               theRHS.m_pos == m_pos;
     }
 
-    bool operator!=(const XalanDequeIterator & theRhs) const
+    bool
+    operator!=(const XalanDequeIterator&   theRHS) const
     {
-        return !(theRhs == *this);
+        return !(theRHS == *this);
     }
 
-    bool operator<(const XalanDequeIterator & theRhs) const
+    bool
+    operator<(const XalanDequeIterator&     theRHS) const
     {
-        return m_pos < theRhs.m_pos;
+        return m_pos < theRHS.m_pos;
     }
 
-    XalanDeque* m_deque;
-    size_type   m_pos;
+private:
+
+    XalanDeque*     m_deque;
+
+    size_type       m_pos;
 };
 
 /**
@@ -168,77 +201,98 @@
 {
 public:
 
- 
     typedef size_t  size_type;
 
     typedef Type            value_type;
     typedef Type&           reference;
     typedef const Type&     const_reference;
 
-    typedef XalanVector<Type, ConstructionTraits>       BlockType;
+    typedef XalanVector<Type, ConstructionTraits>   BlockType;
+    typedef XalanVector<BlockType*>                 BlockIndexType;
 
-    typedef XalanVector<BlockType*> BlockIndexType;
+    typedef XalanDeque<Type, ConstructionTraits>    ThisType;
 
-    typedef XalanDeque<Type, ConstructionTraits>                            ThisType;       
-    typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, ThisType>      iterator;
+    typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, ThisType>          iterator;
     typedef XalanDequeIterator<XalanDequeConstIteratorTraits<value_type>, ThisType>     const_iterator;
 
 #if defined(XALAN_HAS_STD_ITERATORS)
     typedef XALAN_STD_QUALIFIER reverse_iterator<iterator>          reverse_iterator_;
     typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator>    const_reverse_iterator_;
 #elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
+    typedef typename iterator888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4iterator_category    iterator_category;
+
+    // This is a specific case for the Rogue Wave STL on Solaris.
     typedef XALAN_STD_QUALIFIER reverse_iterator<
         iterator,
-        XALAN_STD_QUALIFIER random_access_iterator_tag,
+        iterator_category,
         value_type> reverse_iterator_;
+
     typedef XALAN_STD_QUALIFIER reverse_iterator<
         const_iterator,
-        XALAN_STD_QUALIFIER random_access_iterator_tag,
+        iterator_category,
         const value_type> const_reverse_iterator_;
 #else
-    typedef XALAN_STD_QUALIFIER reverse_iterator<iterator, value_type>                          reverse_iterator_;
-    typedef XALAN_STD_QUALIFIER reverse_iterator<const_iterator, value_type, const_reference>   const_reverse_iterator_;
+    typedef XALAN_STD_QUALIFIER reverse_iterator<
+        iterator,
+        value_type>        reverse_iterator_;
+
+    typedef XALAN_STD_QUALIFIER reverse_iterator<
+        const_iterator,
+        value_type,
+        const_reference>   const_reverse_iterator_;
 #endif
 
     typedef reverse_iterator_           reverse_iterator;
     typedef const_reverse_iterator_     const_reverse_iterator;
 
     typedef typename ConstructionTraits888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onstructor    Constructor;
-    typedef typename Constructor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onstructableType     ConstructibleType;
+    typedef typename Constructor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onstructableType     ConstructableType;
 
     XalanDeque(
-            MemoryManager& memoryManager,
-            size_type initialSize = 0,
-            size_type blockSize = 10) :
+            MemoryManager&  memoryManager,
+            size_type       initialSize = 0,
+            size_type       blockSize = 10) :
         m_memoryManager(&memoryManager),
         m_blockSize(blockSize),
         m_blockIndex(memoryManager,
                     initialSize / blockSize + (initialSize % blockSize == 0 ? 0 : 1)),                    
         m_freeBlockVector(memoryManager)
     {
-        typename Constructor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onstructableType  defaultValue(*m_memoryManager);
+        const ConstructableType     defaultValue(*m_memoryManager);
+
+        XALAN_USING_STD(fill_n)
+        XALAN_USING_STD(back_inserter)
 
-        XALAN_STD_QUALIFIER fill_n(XALAN_STD_QUALIFIER back_inserter(*this), initialSize, defaultValue.value);
+        fill_n(
+            back_inserter(*this),
+            initialSize, 
+            defaultValue.value);
     }
 
-    XalanDeque(const XalanDeque& theRhs, MemoryManager& memoryManager) :
-        m_memoryManager(&memoryManager),
-        m_blockSize(theRhs.m_blockSize),
-        m_blockIndex(*theRhs.m_memoryManager,
-                    theRhs.size() / theRhs.m_blockSize + (theRhs.size() % theRhs.m_blockSize == 0 ? 0 : 1)),
-        m_freeBlockVector(memoryManager)
-    {
-        XALAN_STD_QUALIFIER copy(theRhs.begin(), theRhs.end(), XALAN_STD_QUALIFIER back_inserter(*this));
+    XalanDeque(
+                const XalanDeque&   theRHS,
+                MemoryManager&      theMemoryManager) :
+        m_memoryManager(&theMemoryManager),
+        m_blockSize(theRHS.m_blockSize),
+        m_blockIndex(*theRHS.m_memoryManager,
+                    theRHS.size() / theRHS.m_blockSize + (theRHS.size() % theRHS.m_blockSize == 0 ? 0 : 1)),
+        m_freeBlockVector(theMemoryManager)
+    {
+        XALAN_USING_STD(copy)
+        XALAN_USING_STD(back_inserter)
+
+        copy(
+            theRHS.begin(),
+            theRHS.end(), 
+            back_inserter(*this));
     }
-    
+
    static XalanDeque*
    create(
             MemoryManager&  theManager,
             size_type       initialSize = 0,
             size_type       blockSize = 10)
     {
-        typedef XalanDeque ThisType;
-
         XalanAllocationGuard    theGuard(theManager, theManager.allocate(sizeof(ThisType)));
 
         ThisType* const     theResult =
@@ -256,42 +310,50 @@
         destroyBlockList(m_blockIndex);
     }
 
-    iterator begin()
+    iterator
+    begin()
     {
         return iterator(this, 0);
     }
 
-    const_iterator begin() const
+    const_iterator
+    begin() const
     {
         return const_iterator(const_cast<XalanDeque*>(this), 0);
     }
 
-    iterator end()
+    iterator
+    end()
     {
         return iterator(this, size());
     }
 
-    const_iterator end() const
+    const_iterator 
+    end() const
     {
          return const_iterator(const_cast<XalanDeque*>(this), size());
     }
 
-    const_reverse_iterator rbegin() const
+    const_reverse_iterator 
+    rbegin() const
     {
         return const_reverse_iterator(end());
     }
 
-    const_reverse_iterator rend() const
+    const_reverse_iterator 
+    rend() const
     {
         return const_reverse_iterator(begin());
     }
 
-    bool empty() const
+    bool 
+    empty() const
     {
         return m_blockIndex.empty();
     }
 
-    size_type size() const
+    size_type 
+    size() const
     {
        if (m_blockIndex.empty())
        {
@@ -304,26 +366,32 @@
        }
     }
 
-    value_type& back()
+    value_type&
+    back()
     {
         return m_blockIndex.back()->back();
     }
 
-    value_type& operator[](size_type index)
+    value_type&
+    operator[](size_type    index)
     {
-        BlockType & block = *(m_blockIndex[index / m_blockSize]);
+        BlockType&  block = *m_blockIndex[index / m_blockSize];
+
         return block[index % m_blockSize];
     }
 
-    const value_type& operator[](size_type index) const
+    const value_type&
+    operator[](size_type    index) const
     {
-        BlockType & block = *(m_blockIndex[index / m_blockSize]);
+        BlockType&  block = *m_blockIndex[index / m_blockSize];
+
         return block[index % m_blockSize];
     }
 
-    void clear()
+    void
+    clear()
     {
-        typename BlockIndexTyp888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4iterator iter = m_blockIndex.begin();
+        typename BlockIndexTyp888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4iterator   iter = m_blockIndex.begin();
 
         m_freeBlockVector.reserve(m_freeBlockVector.size() + m_blockIndex.size());
 
@@ -333,25 +401,30 @@
             m_freeBlockVector.push_back(*iter);
             ++iter;
         }
-        
+
         m_blockIndex.clear();
     }
 
-    void push_back(const value_type & value)
+    void
+    push_back(const value_type&     value)
     {
         if (m_blockIndex.empty() ||
             m_blockIndex.back()->size() >= m_blockSize)
         {
-            m_blockIndex.push_back(getNewBlock());
+            pushNewIndexBlock();
         }
 
         m_blockIndex.back()->push_back(value);
     }
 
-    void pop_back()
+    void
+    pop_back()
     {
-        BlockType & lastBlock = *(m_blockIndex.back());
+        assert(!empty());
+
+        BlockType&  lastBlock = *m_blockIndex.back();
         lastBlock.pop_back();
+
         if (lastBlock.empty())
         {
             m_freeBlockVector.push_back(&lastBlock);
@@ -359,9 +432,10 @@
         }
     }
 
-    void resize(size_type newSize)
+    void
+    resize(size_type    newSize)
     {
-        typename Constructor888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4onstructableType  defaultValue(*m_memoryManager);
+        const ConstructableType     defaultValue(*m_memoryManager);
 
         if (newSize > size())
         {
@@ -379,20 +453,33 @@
         }
     }
 
-    void swap(XalanDeque& theRhs)
+    void
+    swap(XalanDeque&    theRHS)
     {
-        MemoryManager* tempMemoryManager = m_memoryManager;
-        m_memoryManager = theRhs.m_memoryManager;
-        theRhs.m_memoryManager = tempMemoryManager;
+        XALAN_USING_STD(swap)
 
-        theRhs.m_blockIndex.swap(m_blockIndex);
-        theRhs.m_freeBlockVector.swap(m_freeBlockVector);
+        swap(m_memoryManager, theRHS.m_memoryManager);
+
+        theRHS.m_blockIndex.swap(m_blockIndex);
+        theRHS.m_freeBlockVector.swap(m_freeBlockVector);
     }
 
-    XalanDeque & operator=(const XalanDeque & theRhs) 
+    XalanDeque&
+    operator=(const XalanDeque&     theRHS) 
     {
-        clear();
-        XALAN_STD_QUALIFIER copy(theRhs.begin(), theRhs.end(), XALAN_STD_QUALIFIER back_inserter(*this));
+        if (this != &theRHS)
+        {
+            XALAN_USING_STD(copy)
+            XALAN_USING_STD(back_inserter)
+
+            clear();
+
+            copy(
+                theRHS.begin(),
+                theRHS.end(),
+                back_inserter(*this));
+        }
+
         return *this;
     }
 
@@ -404,38 +491,34 @@
         return *m_memoryManager;
     }
 
-protected:
+private:
 
-    BlockType* getNewBlock()
+    void
+    pushNewIndexBlock()
     {
-        BlockType * newBlock;
+        // Allocate space first, so we don't have to worry
+        // about an out-of-memory error once we've constructed
+        // the new block.
+        m_blockIndex.push_back(0);
 
         if (m_freeBlockVector.empty())
         {
-            newBlock = allocate(1);
-            new (&*newBlock) BlockType(*m_memoryManager, m_blockSize);
+            XalanConstruct(
+                *m_memoryManager,
+                m_blockIndex.back(),
+                *m_memoryManager,
+                m_blockSize);
         }
         else
         {
-            newBlock = m_freeBlockVector.back();
+            m_blockIndex.back() = m_freeBlockVector.back();
+
+            // Now that ownership has been transfered, pop
+            // it off the free list.
             m_freeBlockVector.pop_back();
         }
 
-        assert (newBlock != 0);
-
-        return newBlock;
-    }
-
-    BlockType*
-    allocate(size_type  size)
-    {
-        const size_type     theBytesNeeded = size * sizeof(BlockType);
-
-        BlockType* pointer = (BlockType*)m_memoryManager->allocate(theBytesNeeded);
-        
-        assert(pointer != 0);
-        
-        return pointer;
+        assert(m_blockIndex.back() != 0);
     }
 
     void
@@ -446,7 +529,7 @@
 
         while (iter != theBlockIndex.end())
         {
-            XalanDestroy(*m_memoryManager, *(*iter));
+            XalanDestroy(*m_memoryManager, *iter);
 
             ++iter;
         }
@@ -458,13 +541,13 @@
         m_memoryManager->deallocate(pointer);
     }
 
-    MemoryManager*  m_memoryManager;
+    MemoryManager*      m_memoryManager;
+
     const size_type     m_blockSize;
 
     BlockIndexType     m_blockIndex; 
     BlockIndexType     m_freeBlockVector;
 
-private:
 
     // These are not implemented
     XalanDeque();



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 22 21:59:55 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 81686 invoked from network); 22 Dec 2008 21:59:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 22 Dec 2008 21:59:55 -0000
Received: (qmail 44559 invoked by uid 500); 22 Dec 2008 21:59:55 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 44545 invoked by uid 500); 22 Dec 2008 21:59:55 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 44536 invoked by uid 99); 22 Dec 2008 21:59:55 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2008 13:59:55 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2008 21:59:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4A16E238895F; Mon, 22 Dec 2008 13:59:34 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r728798 - /xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
Date: Mon, 22 Dec 2008 21:59:34 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec 22 13:59:33 2008
New Revision: 728798

URL: http://svn.apache.org/viewvc?rev=728798&view=rev
Log:
Visual C++ 6.0 fix.

Modified:
    xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp

Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=728798&r1=728797&r2=728798&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Mon Dec 22 13:59:33 2008
@@ -529,7 +529,7 @@
 
         while (iter != theBlockIndex.end())
         {
-            XalanDestroy(*m_memoryManager, *iter);
+            XalanDestroy(*m_memoryManager, **iter);
 
             ++iter;
         }
@@ -545,8 +545,8 @@
 
     const size_type     m_blockSize;
 
-    BlockIndexType     m_blockIndex; 
-    BlockIndexType     m_freeBlockVector;
+    BlockIndexType		m_blockIndex; 
+    BlockIndexType		m_freeBlockVector;
 
 
     // These are not implemented



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com


From xalanfrankmartin@example.com Mon Dec 29 19:32:28 2008
Return-Path: <xalanfrankmartin@example.com>
Delivered-To: frankmartin@example.com
Received: (qmail 37521 invoked from network); 29 Dec 2008 19:32:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 29 Dec 2008 19:32:28 -0000
Received: (qmail 4062 invoked by uid 500); 29 Dec 2008 19:32:28 -0000
Delivered-To: frankmartin@example.com
Received: (qmail 4043 invoked by uid 500); 29 Dec 2008 19:32:28 -0000
Mailing-List: contact frankmartin@example.com; run by ezmlm
Precedence: bulk
list-help: <mailto:frankmartin@example.com>
list-unsubscribe: <mailto:frankmartin@example.com>
List-Post: <mailto:frankmartin@example.com>
Reply-To: <frankmartin@example.com>
List-Id: <xalan-cvs.xml.apache.org>
Delivered-To: mailing list frankmartin@example.com
Received: (qmail 4034 invoked by uid 99); 29 Dec 2008 19:32:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Dec 2008 11:32:28 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Dec 2008 19:32:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5107723888A6; Mon, 29 Dec 2008 11:32:07 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r729981 - /xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
Date: Mon, 29 Dec 2008 19:32:07 -0000
To: frankmartin@example.com
From: frankmartin@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <frankmartin@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dbertoni
Date: Mon Dec 29 11:32:06 2008
New Revision: 729981

URL: http://svn.apache.org/viewvc?rev=729981&view=rev
Log:
Removed unused member function and fixed tabs.

Modified:
    xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp

Modified: xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp?rev=729981&r1=729980&r2=729981&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Mon Dec 29 11:32:06 2008
@@ -535,18 +535,12 @@
         }
     }
 
-    void
-    deallocate(BlockType*  pointer)
-    {
-        m_memoryManager->deallocate(pointer);
-    }
-
     MemoryManager*      m_memoryManager;
 
     const size_type     m_blockSize;
 
-    BlockIndexType		m_blockIndex; 
-    BlockIndexType		m_freeBlockVector;
+    BlockIndexType	    m_blockIndex; 
+    BlockIndexType	    m_freeBlockVector;
 
 
     // These are not implemented



---------------------------------------------------------------------
To unsubscribe, e-mail: frankmartin@example.com
For additional commands, e-mail: frankmartin@example.com



{'source': 'Apache Software Foundation Public Mail Archives'}