svn commit: r759782 - in /xalan/c/trunk/src/xalanc: Include/XalanDeque.hpp PlatformSupport/XalanFStreamOutputStream.hpp PlatformSupport/XalanOutputStream.hpp

Author: dbertoni
Date: Sun Mar 29 20:40:25 2009
New Revision: 759782

URL: http://svn.apache.org/viewvc?rev=759782&view=rev
Log:
Tweaks for HP-UX PA-RISC.

Modified:
    xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.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=759782&r1=759781&r2=759782&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanDeque.hpp Sun Mar 29 20:40:25 2009
@@ -456,9 +456,9 @@
     void
     swap(XalanDeque&    theRHS)
     {
-        XALAN_USING_STD(swap)
-
-        swap(m_memoryManager, theRHS.m_memoryManager);
+        MemoryManager* const temp = m_memoryManager;
+        m_memoryManager = theRHS.m_memoryManager;
+        theRHS.m_memoryManager = temp;
 
         theRHS.m_blockIndex.swap(m_blockIndex);
         theRHS.m_freeBlockVector.swap(m_freeBlockVector);

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp?rev=759782&r1=759781&r2=759782&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp Sun Mar 29 20:40:25 2009
@@ -54,15 +54,16 @@
      * @param theBufferSize The size of the transcoding buffer
      */
     XalanFStreamOutputStream(
-            FILE*               theFileHandle,
+            FILE*           theFileHandle,
             MemoryManager&  theManager,
-            size_type           theBufferSize = eDefaultBufferSize);
+            size_type       theBufferSize = eDefaultBufferSize);
 
     static XalanFStreamOutputStream*
     create(
-            FILE*               theFileHandle,
+            FILE*           theFileHandle,
             MemoryManager&  theManager,
-            size_type           theBufferSize = eDefaultBufferSize);
+            size_type       theBufferSize = eDefaultBufferSize);
+
     virtual
     ~XalanFStreamOutputStream();
 
@@ -76,8 +77,9 @@
          * 
          * @param theErrorCode number of error encountered
          */
-        XalanFStreamOutputStreamWriteException(int  theErrorCode,
-                                                XalanDOMString& theBuffer);
+        XalanFStreamOutputStreamWriteException(
+            int                 theErrorCode,
+            XalanDOMString&     theBuffer);
 
         virtual
         ~XalanFStreamOutputStreamWriteException();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp?rev=759782&r1=759781&r2=759782&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp Sun Mar 29 20:40:25 2009
@@ -399,6 +399,12 @@
         getType() const;
     };
 
+    static XalanDOMString&
+    formatMessage(
+            const XalanDOMString&   theMessage,
+            int                     theErrorCode,
+            XalanDOMString&         theBuffer);
+
 protected:
 
     /**
@@ -437,12 +443,6 @@
     static const XalanDOMString::size_type  s_nlStringLength;
     static const XalanDOMString::size_type  s_nlCRStringLength;
 
-    static XalanDOMString&
-    formatMessage(
-            const XalanDOMString&   theMessage,
-            int                     theErrorCode,
-            XalanDOMString&         theBuffer);
-
 private:
 
     // These are not implemented...