svn commit: r735323 - /xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp

Author: dbertoni
Date: Sat Jan 17 10:40:57 2009
New Revision: 735323

URL: http://svn.apache.org/viewvc?rev=735323&view=rev
Log:
Fixed typos and problems with building on Visual Studio 6.

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=735323&r1=735322&r2=735323&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Sat Jan 17 10:40:57 2009
@@ -84,7 +84,7 @@
     {
     }
 
-    // The is standard copy-construction for the non-const iterator type.  For the
+    // This 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) :
@@ -93,7 +93,7 @@
     {
     }
 
-    // The is the standard assignment operator for the non-const iterator type.
+    // This 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.
@@ -529,7 +529,15 @@
 
         while (iter != theBlockIndex.end())
         {
-            XalanDestroy(*m_memoryManager, **iter);
+            // Normally, we should be able to just call
+            // the version of XalanDestroy() that accepts
+            // a pointer, but Visual Studio 6 has issues
+            // with partial ordering, so we're stuck with
+            // this for now.
+            if (*iter != 0)
+            {
+                XalanDestroy(*m_memoryManager, **iter);
+            }
 
             ++iter;
         }