Просмотр исходного кода

Merge branch 'master' of github.com:leethomason/tinyxml2

Lee Thomason 6 лет назад
Родитель
Сommit
de62366e6a
2 измененных файлов с 1 добавлено и 3 удалено
  1. 0 2
      tinyxml2.cpp
  2. 1 1
      xmltest.cpp

+ 0 - 2
tinyxml2.cpp

@@ -2635,8 +2635,6 @@ void XMLPrinter::OpenElement( const char* name, bool compactMode )
 
 
     if ( _textDepth < 0 && !_firstElement && !compactMode ) {
     if ( _textDepth < 0 && !_firstElement && !compactMode ) {
         Putc( '\n' );
         Putc( '\n' );
-    }
-    if ( !compactMode ) {
         PrintSpace( _depth );
         PrintSpace( _depth );
     }
     }
 
 

+ 1 - 1
xmltest.cpp

@@ -1290,7 +1290,7 @@ int main( int argc, const char ** argv )
 	}
 	}
 
 
 	{
 	{
-		// trying to repro ]1874301]. If it doesn't go into an infinite loop, all is well.
+		// trying to repro [1874301]. If it doesn't go into an infinite loop, all is well.
 		unsigned char buf[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?><feed><![CDATA[Test XMLblablablalblbl";
 		unsigned char buf[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?><feed><![CDATA[Test XMLblablablalblbl";
 		buf[60] = 239;
 		buf[60] = 239;
 		buf[61] = 0;
 		buf[61] = 0;