xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmit...@apache.org
Subject cvs commit: xml-xalan/c/src/xalanc/XMLSupport XalanIndentWriter.hpp XalanXMLSerializerBase.cpp
Date Fri, 10 Jun 2005 20:28:10 GMT
dmitryh     2005/06/10 13:28:10

  Modified:    c/src/xalanc/XMLSupport XalanIndentWriter.hpp
                        XalanXMLSerializerBase.cpp
  Log:
  Fixed a merge bug for XALANC-480
  
  Revision  Changes    Path
  1.2       +2 -7      xml-xalan/c/src/xalanc/XMLSupport/XalanIndentWriter.hpp
  
  Index: XalanIndentWriter.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/XalanIndentWriter.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XalanIndentWriter.hpp	6 Jun 2005 01:32:45 -0000	1.1
  +++ XalanIndentWriter.hpp	10 Jun 2005 20:28:10 -0000	1.2
  @@ -49,7 +49,7 @@
           m_isprevtext(false),
           m_preserves(writer.getMemoryManager(), 5)
       {
  -        assert( m_indent != 0xFFFFFFFF);
  +        assert( m_indent != -1);
       }
   
       ~XalanIndentWriter()
  @@ -155,12 +155,7 @@
       }
   
   private:
  -     //// not implemented
  -     //XalanIdentWriter<Writer>(const XalanIdentWriter<Writer>&);
  -     //
  -     //XalanIdentWriter<Writer>&
  -     //operator=(const XalanIdentWriter<Writer>&);
  -     //
  +
        //data members
        
       WhiteSpaceWriter m_whiteSpaceWriter;
  
  
  
  1.3       +4 -4      xml-xalan/c/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp
  
  Index: XalanXMLSerializerBase.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XalanXMLSerializerBase.cpp	6 Jun 2005 01:32:45 -0000	1.2
  +++ XalanXMLSerializerBase.cpp	10 Jun 2005 20:28:10 -0000	1.3
  @@ -61,10 +61,10 @@
   
   const char  XalanXMLSerializerBase::s_specialChars1_1[eSpecialsSize] =
   {
  - /* 00-07 */    eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,
  - /* 08-0F */    eNone,  eAttr,  eBoth,  eNone,  eNone,  eAttr,  eNone,  eNone,
  - /* 10-17 */    eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,
  - /* 18-1F */    eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,
  + /* 00-07 */    eNone,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,
  + /* 08-0F */    eBoth,  eAttr,  eBoth,  eBoth,  eBoth,  eAttr,  eBoth,  eBoth,
  + /* 10-17 */    eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,
  + /* 18-1F */    eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,  eBoth,
    /* 20-27 */    eNone,  eNone,  eAttr,  eNone,  eNone,  eNone,  eBoth,  eNone,
    /* 28-2F */    eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,
    /* 30-37 */    eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,  eNone,
  
  
  

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


Mime
View raw message